[FIX] Handle decimal and thousand separator in 'round_trip' converer #35377
Conversation
This file contains hidden or 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
ales-erjavec
force-pushed
the
round-trip-decimal
branch
2 times, most recently
from
5020dfd to
aab2f52
Compare
WillAyd
requested changes
Jul 22, 2020
ales-erjavec
force-pushed
the
round-trip-decimal
branch
from
aab2f52 to
cc0c228
Compare
|
Hello @ales-erjavec! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found: There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻 Comment last updated at 2020-08-10 10:12:58 UTC |
ales-erjavec
force-pushed
the
round-trip-decimal
branch
from
cc0c228 to
e4bca08
Compare
WillAyd
reviewed
Jul 23, 2020
ales-erjavec
force-pushed
the
round-trip-decimal
branch
from
e4bca08 to
9cf0755
Compare
jreback
requested changes
Aug 6, 2020
gfyoung
approved these changes
Aug 7, 2020
|
@ales-erjavec can you also run the current csv asv's to see if perf is changed; we might need additional coverage for thousands sep as well. |
WillAyd
requested changes
Aug 7, 2020
pandas/_libs/src/parser/tokenizer.c
Outdated
| p++; | ||
| } | ||
| // Copy the remainder of the string as is. | ||
| memcpy(dst, p, length + 1 - (p - s)); |
There was a problem hiding this comment.
Can you use strncpy here instead? Would make this slightly more readable and then you won't need to manually add a null byte
| // Copy integer part dropping `tsep` | ||
| while (isdigit_ascii(*p)) { | ||
| *dst++ = *p++; | ||
| p += (tsep != '\0' && *p == tsep); |
There was a problem hiding this comment.
Does the null byte check here serve a purpose?
There was a problem hiding this comment.
Yes. tsep is null when no thousands separator is defined. But the loop must not skip the terminating null byte in the input string (the second condition) which would happen on e.g. '123\0'
| } else { | ||
| *error = -1; | ||
| if (q != NULL) { | ||
| // p and pc are different len due to tsep removal. Can't report |
There was a problem hiding this comment.
Yes. The "1,2e1_0" for instance. I.e something that is prefixed with a number but has extra trailing characters.
In case of non c-locale decimal and tsep, copy and fixup the source string before passing it to PyOS_string_to_double
Always make a copy of input string.
ales-erjavec
force-pushed
the
round-trip-decimal
branch
from
74be91c to
8703ad6
Compare
|
jreback
approved these changes
Aug 11, 2020
|
thanks @ales-erjavec |
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.
black pandasgit diff upstream/master -u -- "*.py" | flake8 --diffIn case of non c-locale decimal and tsep, copy and fixup the source string before passing it to PyOS_string_to_double