update the project archive sync support for py2 compatability #8057
Conversation
playbook runs in AWX are still supported in python2, so this adds support for archive-based project syncs in py2
| except BadZipFile: | ||
| try: | ||
| archive = tarfile.open(src) | ||
| except tarfile.ReadError: |
There was a problem hiding this comment.
This lack of indentation was actually a legitimate bug we just missed in code review.
| try: | ||
| from zipfile import BadZipFile | ||
| except ImportError: | ||
| from zipfile import BadZipfile as BadZipFile # py2 compat |
There was a problem hiding this comment.
Booooooooooooo python2
| try: | ||
| is_dir = member.isdir() | ||
| except AttributeError: | ||
| is_dir = member.filename[-1] == '/' # py2 compat for ZipInfo |
There was a problem hiding this comment.
python2's zipfile doesn't have this, but this is what py3 does, so I just copied it here
|
|
||
| if is_dir: | ||
| os.makedirs(dest, exist_ok=True) | ||
| try: | ||
| os.makedirs(dest) |
There was a problem hiding this comment.
poor man's exist_ok=True (which also doesn't exist in py2)
|
Build succeeded.
|
|
Build succeeded (gate pipeline).
|
|
@ryanpetrello I had the understanding that AWX was solidly Python3 at this point, and even if a project was associated with a Py2 venv, the project sync would be done with the default Py3, no? Seems unreasonable for the built ins to not be able to depend on the main Python version! In any case, as my understanding was apparently wrong, thanks for catching this and fixing it! P.S. I'm so tired of writing backwards compatible Python... Sometimes I even get bit when using |
|
Hey @philipsd6, Hey no big deal. I'm a maintainer and I forgot too 😂. When a project update runs, it uses the default "Ansible" virtualenv, and we still technically support systems (like RHEL7) that have python2 as their default system Python for playbook execution. The Python code that AWX itself runs in its various processes is all python3 only, though. |
playbook runs in AWX are still supported in python2, so this adds
support for archive-based project syncs in py2
cc @philipsd6