py2/py3 patches reviewed #185
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
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
replace
(foo, bar) = e
with
(foo, bar) = e.args
while will run in with both python2 and python3
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Fix some missed conversions of
except Exception, e:
to
except Exception as e:
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
To allow code run in both python3 and python2 we have to ensure that md5 always receives bytes Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
…cted Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
…code Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
…encode Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This seems to be a side affect of using StringIO.StringIO in python2. We need to use StringIO.StringIO (instead of cStringIO.StringIO) Note: https://docs.python.org/2/library/stringio.html states "The StringIO object can accept either Unicode or 8-bit strings, but mixing the two may take some care. If both are used, 8-bit strings that cannot be interpreted as 7-bit ASCII (that use the 8th bit) will cause a UnicodeError to be raised when getvalue() is called" and also about cStringIO "Unlike the StringIO module, this module is not able to accept Unicode strings that cannot be encoded as plain ASCII strings. We don't use cStringIO because now we do have more unicode (from porting efforts to make the code py2/py3 compatible). For sure some of these unicode string cannot be encoded as plain ASCII. running test 'samba.tests.dcerpc.dnsserver' (with python2) results in UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 26: ordinal not in range(128) Change the native string (as it is in python2) that contains a non ascii character to unicode. (in a plain python3 only world this would not be an issue) Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
This is now in autobuild, except for the top patch around the DNS high byte (0xff). I want to think on that some more, we really want to force a high byte into the end record, so I'll check on this more with @GSam tomorrow. If a genuinely valid UTF8 sequence with a high byte will satisfy then we may wish to use that. |
Closed
|
The Cstring patch needs to be after or alongside the DNS patch I dropped, or else the build fails. In general try it is best if the patches all pass make test (in theory, there isn't an automated check for this part) to aid a git bisect or dropping patches from the series like I have. |
|
Also check if the Cstring thing is https://bugzilla.samba.org/show_bug.cgi?id=13435 and if so tag with that bug please! |
|
Except for the CString patches, merged as 26c4084 in master for Samba 4.9 |
|
I don't believe this has anything to do with cString, looking into it |
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.
These are the py2/py3 patches I'm happy to have my review on.
See also:
https://gitlab.com/catalyst-samba/samba/pipelines/21849494
https://gitlab.com/catalyst-samba/samba/commits/abartlet-np-py3
Reviewed-by: Andrew Bartlett abartlet@samba.org