Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: benjaminp/six
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.12.0
Choose a base ref
...
head repository: benjaminp/six
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.13.0
Choose a head ref
  • 19 commits
  • 10 files changed
  • 8 contributors

Commits on Dec 29, 2018

  1. Remove distutils fallback and outdated comment (#269)

    setuptools includes a vendored version of six (and other dependencies).
    They are not installed through traditional tools. Therefore, distutils
    is not required as a fallback to facilitate setuptools.
    
    https://github.com/pypa/setuptools/blob/v40.6.3/setuptools/_vendor/six.py
    jdufresne authored and benjaminp committed Dec 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d5efa74 View commit details

Commits on Jan 2, 2019

  1. Document that binary_type is only necessary for Python 2.5 compat (#270)

    As documented in the Python 2.6 release notes:
    
    https://docs.python.org/2/whatsnew/2.6.html#pep-3112-byte-literals
    
    > For future compatibility, Python 2.6 adds bytes as a synonym for the
    > str type ...
    
    To encourage more forward compatible code bases, inform users of this
    builtin alias. This addition is similar in spirit to the note for the
    b() function.
    jdufresne authored and benjaminp committed Jan 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    44f9d2e View commit details

Commits on Jan 19, 2019

  1. minor formatting fix to ensure_str documentation (#273)

    Small update to the `ensure_str` function's documentation formatting to
    match `ensure_binary` and `ensure_text`'s formatting.
    catleeball authored and benjaminp committed Jan 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    296c10c View commit details

Commits on Jan 28, 2019

  1. Travis CI: Start testing on Python 3.6, 3.7, and nightly. (#275)

    Also, [remove the __sudo__ tag per recommendation of Travis](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration).
    cclauss authored and benjaminp committed Jan 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d507154 View commit details

Commits on Feb 2, 2019

  1. Add missing "as". (#276)

    jdufresne authored and benjaminp committed Feb 2, 2019
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6845a1b View commit details

Commits on Apr 9, 2019

  1. Remove six.io. (#285)

    There was `six.io` if and only if py3, which was error-prone.
    toslunar authored and benjaminp committed Apr 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8da94b8 View commit details

Commits on Jun 19, 2019

  1. Increment copyright year.

    benjaminp committed Jun 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    aa4e90b View commit details

Commits on Nov 5, 2019

  1. Add support for PEP 560. (#305)

    ilevkivskyi authored and benjaminp committed Nov 5, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    ebb0db5 View commit details
  2. py.test -> pytest

    benjaminp committed Nov 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    10538f7 View commit details
  3. Pin pytest. (#306)

    We are obliged to use a very old version that supports Python 3.2.
    benjaminp authored Nov 5, 2019
    Copy the full SHA
    efd43d0 View commit details
  4. Revert "Remove distutils fallback and outdated comment (#269)" (#304)

    This reverts commit d5efa74.
    
    The original intention of providing a distutils fallback has not gone
    away. These three extra lines will almost never be used, as most people
    have setuptools or install with pip anyway, and at the same time it
    serves as a very low-maintenance solution for people who *do* want to
    bootstrap setuptools.
    
    Bootstrapping setuptools without vendored six (and pyparsing) is a valid
    use case. Although setuptools by default ships with vendored
    dependencies, it supports removing the contents of the _vendored/
    directory and falling back to an installed version of six.py -- and
    thirdparty vendors of setuptools, such as Arch Linux and OpenSUSE,
    actually make use of this and need to be able to bootstrap the
    dependency tree of setuptools itself.
    eli-schwartz authored and benjaminp committed Nov 5, 2019
    Copy the full SHA
    7385912 View commit details
  5. Update CI Pythons.

    - Add Python 3.8.
    - Unpin pypy2.7 and pypy3.
    benjaminp committed Nov 5, 2019
    Copy the full SHA
    899b9c6 View commit details
  6. Copy the full SHA
    a997033 View commit details
  7. Add ndbm move. (#299)

    benbariteau authored and benjaminp committed Nov 5, 2019
    Copy the full SHA
    1f2f571 View commit details
  8. Add six.moves.collections_abc.

    Fixes #155.
    Closes #241.
    benjaminp committed Nov 5, 2019
    Copy the full SHA
    0dc54ea View commit details
  9. Copy the full SHA
    8f74902 View commit details
  10. Copy the full SHA
    a64af38 View commit details
  11. Copy the full SHA
    203b81c View commit details
  12. Bump version to 1.13.0.

    benjaminp committed Nov 5, 2019
    Copy the full SHA
    ec58185 View commit details
Loading