Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Python 3 support #51

Merged
merged 55 commits into from
May 16, 2018
Merged

[WIP] Python 3 support #51

merged 55 commits into from
May 16, 2018

Conversation

davisagli
Copy link
Member

@davisagli davisagli commented Jan 24, 2018 •
edited by icemac
Loading

I took the existing py3 branch and made some changes to get tests passing on Python 2.7 and 3.6.

The overall approach is:

  • I/O for files in GenericSetup contexts is done as bytes
  • In Python 3, XML is decoded before parsing and encoded after serializing. In Python 2 the file contents are passed on to the parser without decoding. This means that by default, import/export handlers should be working with native strings in both Pythons. If a handler needs bytes in Python 3 or text in Python 2 for a particular case it would need to handle that conversion itself.

I'm not sure if this approach is right so it may be best to try using this to port more of CMF before blessing it.

Looks like some more work may be needed to support 3.4. Zope itself no longer supports Python 3.4.

Closes #51.

tomgross and others added 28 commits August 9, 2017 19:04
@tomgross
Start Python 3 porting
9ef86b8
@tomgross
Test Python 3 on travis
01ad691
@tomgross
Adjust path of buildout script
eb485af
@tomgross
More Py3 fixes
853e29e
@tomgross
text type fixes
bad5608
Test Python 3 via tox.
8d52b2e
Ensure to use the newest non-pinned versions.
2906058
Colorize output.
39a705e
Fix imports.
1faaf31
@gotcha
Merge branch 'master' into py3
91c9d83 
py27 tests pass
@witsch
Let's not 3.5 until we got 3.6 working...
9dc0158
@gotcha
avoid version conflict for py36 on Travis
1091141
@gotcha
Merge branch 'py3' of github.com:zopefoundation/Products.GenericSetup…
9b9e1a3 
… into py3
@gotcha
cache eggs on Travis
a5962e7
@gotcha
revert change that broke python27 on Travis
b52ae8e 
python36 still does not work
@witsch
Allow to pass arguments to the testrunner.
132acb2 
  $ tox -- --test=test_empty --pdb
@gotcha
try to have buildout running under python36 on Travis
2bfac16
@witsch
Pass explicit encoding (of "utf-8") when generating XML.
eb2c157 
This way we don't need to encode strings for every node, which
breaks with Python 3.
@witsch
The value of the property will be (utf-8) encoded in Python 2.
a32024c
@witsch
With eb2c157 all test XML snippets will need to be encoded (to bytes).
49b419c
@witsch
Let's use the latest beta KGS of Zope.
1d95587
@witsch
Put (all) source checkouts into the top-level directory.
651e7a2 
This way any changes made there will also apply to all tox environments.
@witsch
Adjust to 'lines' property now storing bytes.
b213541 
See zopefoundation/Zope#206
@witsch
Refactor tests to work with both Python 2 & 3.
a1dd854
@witsch
(Mostly) fix handling of tarballs.
f65a104 
They need to be fed with bytes as their "magic header" is written
as bytes (in the `gzip` module) and the `generateXML` methods also
"return a round-trippable XML representation".
@witsch
Provide bytes when writing to files.
bf4e7f3 
This fixes a number of "a bytes-like object is required, not 'str'"
and "Must be bytes" errors.
@davisagli
get tests passing
9d04a80
@davisagli
Merge remote-tracking branch 'origin/master' into davisagli-py3
ae3b4e7
@davisagli davisagli requested review from witsch and gotcha January 24, 2018 15:09
dataflake
dataflake approved these changes May 13, 2018
View reviewed changes
Copy link
Member

@dataflake dataflake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my point of view the branch is now ready for merging.

This was referenced May 13, 2018
Merged
Merged
@dataflake
Copy link
Member

@icemac you're right, just did that

@dataflake
Copy link
Member

@icemac Please don't merge to master until I have fixed the CMFCore failures with this branch

@dataflake dataflake self-assigned this May 15, 2018
@icemac
Copy link
Member

icemac commented May 15, 2018

@dataflake Don't worry, I'll keep my hands away from this PR. 😁

@dataflake dataflake merged commit 6d67f02 into master May 16, 2018
@davilima6 davilima6 deleted the davisagli-py3 branch June 7, 2018 18:51
@pbauer pbauer mentioned this pull request Jul 14, 2018
Closed
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tseaver tseaver tseaver left review comments

@dataflake dataflake dataflake approved these changes

@icemac icemac icemac left review comments

@witsch witsch Awaiting requested review from witsch

@gotcha gotcha Awaiting requested review from gotcha

@tomgross tomgross Awaiting requested review from tomgross

Assignees

@dataflake dataflake

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@davisagli @gotcha @pbauer @ale-rt @dataflake @icemac @tseaver @tomgross @witsch @davilima6