[Py3] allow to run wsgi - part1 #393
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MartinBasti
changed the title
|
@MartinBasti cert tests are failing. I have restarted the failing job. Let's see if the error persists or was just caused by a Travis hick up. |
|
@tiran we found the issue that caues random test fails, @HonzaCholasta will provide PR with fix, that should be pushed before these commits |
This fix is temporal because Memcache will be removed soon, so it is more workaround than fix https://fedorahosted.org/freeipa/ticket/4985
json library parses string so input must be decoded https://fedorahosted.org/freeipa/ticket/4985
Variable 'e' has only local scope in except block in Py3 https://fedorahosted.org/freeipa/ticket/4985
ccache contains binary data, so it should be read and write in binary mode https://fedorahosted.org/freeipa/ticket/4985
WSGI prints TypeError into error log when IPA doesn't return bytes in list as result https://fedorahosted.org/freeipa/ticket/4985
variable 'e' is valid only in except block in py3, so it must be assigned to different variable for further usage https://fedorahosted.org/freeipa/ticket/4985
Update encoding/decoding accordingly to work under Py3 Removing functions that were used only once in code and give no real improvements https://fedorahosted.org/freeipa/ticket/4985
Values passed to LDAP must be bytes https://fedorahosted.org/freeipa/ticket/4985
Remove decode() as it causes error in py3 because the attribute is already string not bytes https://fedorahosted.org/freeipa/ticket/4985
Bytes are unsupported and we should raise a TypeError from Principal __init__ method otherwise we get hard to debug result
csr must be in string because framework excpects only strings, so we have to decode it back https://fedorahosted.org/freeipa/ticket/4985
|
Rebased, ready to be reviewed |
tiran
reviewed
Jan 24, 2017
| @@ -21,6 +21,7 @@ | |||
| import os | |||
| import re | |||
| import time | |||
| import io | |||
There was a problem hiding this comment.
Is there any particular reason you are using the io module here? In Python 3 io.open is open. In Python 2 the io module's main use is to auto-encode UTF-8 text. It's not wrong, I'm just curious.
There was a problem hiding this comment.
I wanted to use the same
| @@ -85,9 +85,16 @@ def strip_header(pem): | |||
| """ | |||
| Remove the header and footer from a certificate. | |||
| """ | |||
| s = pem.find("-----BEGIN CERTIFICATE-----") | |||
| if isinstance(pem, bytes): | |||
There was a problem hiding this comment.
How about a regular expression?
def strip_header(pem):
regexp = u"^-----BEGIN CERTIFICATE-----\s+(.*?)\s+^-----END CERTIFICATE-----"
if isinstance(pem, bytes):
regexp = regexp.encode('ascii')
s = re.search(regexp, pem, re.MULTILINE | re.DOTALL)
if s is not None:
return s.group(1)
else:
return pem
There was a problem hiding this comment.
Good idea, thanks
Various method passed various bytes or unicode as parameter https://fedorahosted.org/freeipa/ticket/4985
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With these patches we can run commands with server running on py3
Note: to use py3 install module
python3-mod_wsgithat enables py3 wsgi automaticallyNote: this may or may not depend (I haven't tested) on my PR #382 so it contains all patches, will be rebased when PR #382 merged
first WSGI related commit is