946c6a7 Rebase to 2.7.17rc1

Authored and Committed by churchyard 4 years ago
    Rebase to 2.7.17rc1
    
    Upstreamed patches:
    
    - 157: https://github.com/python/cpython/pull/12235
    - 168: https://github.com/python/cpython/pull/12349
    
    Rebased patches:
    
    - 189: updated bundles setuptools/pip versions
    
        
file modified
+2 -2
file modified
+9 -36
file modified
+1 -1