Skip to content

Fix python2.6 support#232

Merged
nir0s merged 8 commits into
python-distro:python2.6-supportfrom
abadger:fix-python2.6-support
Feb 3, 2019
Merged

Fix python2.6 support#232
nir0s merged 8 commits into
python-distro:python2.6-supportfrom
abadger:fix-python2.6-support

Conversation

@abadger

@abadger abadger commented Dec 13, 2018

Copy link
Copy Markdown
Contributor

This builds on #231 to get the nir0s/distro python2.6-support branch working on Python-2.6.

@abadger abadger force-pushed the fix-python2.6-support branch 3 times, most recently from 7c657d2 to 1f7a54b Compare December 13, 2018 22:54
abadger pushed a commit to ansible/ansible that referenced this pull request Dec 17, 2018
* Port bundled distro to use optparse instead of argparse (py2.6)
* Use an absolute import to satisfy the current import testing harness
* Port from subprocess.check_output to subprocess.Popen.communicate() (py2.6)
* Add license location

The changes have been proposed upstream here:
python-distro/distro#232

Upstream is contemplating a branch where everyone wanting python-2.6
support can collaborate without it becoming part of the regularly
supported releases.
kbreit pushed a commit to kbreit/ansible that referenced this pull request Jan 11, 2019
* Port bundled distro to use optparse instead of argparse (py2.6)
* Use an absolute import to satisfy the current import testing harness
* Port from subprocess.check_output to subprocess.Popen.communicate() (py2.6)
* Add license location

The changes have been proposed upstream here:
python-distro/distro#232

Upstream is contemplating a branch where everyone wanting python-2.6
support can collaborate without it becoming part of the regularly
supported releases.
@nir0s

nir0s commented Feb 2, 2019

Copy link
Copy Markdown
Collaborator

@abadger, LGTM. Can you please fix conflicts?

adamjstewart and others added 8 commits February 2, 2019 11:31
* Port the 2.7 version of check_output that we're bundling for 2.6
* Only use our check_output when running on a Python which does not
  have subprocess.check_output
* Pull check_output code to the toplevel because it isn't conceptually
  part of LinuxDistribution
@abadger abadger force-pushed the fix-python2.6-support branch from a308ecd to 103e388 Compare February 2, 2019 19:31
@abadger

abadger commented Feb 2, 2019

Copy link
Copy Markdown
Contributor Author

Rebased and pushed.

@nir0s nir0s merged commit 73b9d6c into python-distro:python2.6-support Feb 3, 2019
@abadger abadger deleted the fix-python2.6-support branch February 5, 2019 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants