GeezerVisonThe World Wide Web, restored to 800 pixels of glory. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Home|About|Gaming cabinet|Archives|How it works|Starter sites | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
GeezerVison is showing github.com — gh-110289: C API: Add PyUnicode_EqualToUTF8() function by serhiy-storchaka · Pull Request #110297 · python/cpython Conversation
|
| assert(str); | ||
| if (PyUnicode_IS_ASCII(unicode)) { | ||
| size_t len = (size_t)PyUnicode_GET_LENGTH(unicode); | ||
| return strlen(str) == len && |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to test the length first, to make the code more readable.
Like:
if (strlen(str) == len) {
return 1;
}
return memcmp(...);
Same below.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
It is the same in _PyUnicode_EqualToASCIIString().
How
if (!a) { return 0; } return b;
is more readable than simple return a && b;? It is what the && operator for.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
is more readable than simple return a && b;?
For me, it's easier to reason about a single test per line when I review code.
Keep a && b if you prefer.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
The readability problem as I see it, is that your && use has side effects; it is not a pure logic expression.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
For me, it's easier to reason about a single test per line when I review code.
Fortunately, every condition here is already on a separate line.
The readability problem as I see it, is that your
&&use has side effects; it is not a pure logic expression.
It is how && works in C. There is a lot of code like arg != NULL and PyDict_Check(arg) && PyDict_GET_SIZE(arg) > count. I do not think rewriting it in three ifs with gotos can improve readability.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Suggestion for a different function name to avoid any confusion... and make it shorter: |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
I considered two variants: |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| Compare a Unicode object with a UTF-8 encoded C string and return true | ||
| if they are equal and false otherwise. |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
| Compare a Unicode object with a UTF-8 encoded C string and return true | |
| if they are equal and false otherwise. | |
| Compare a Unicode object with a UTF-8 encoded C string and return non-zero | |
| if they are equal or 0 otherwise. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
It looks to me, that "return true" is more often used than "return non-zero". In this case it is more accurate, because it always returns 1, not other non-zero value. Perhaps other functions which return non-zero was a macro that returned not 1 (something like (arg->flags & FLAG))?
Sorry, something went wrong.
There was an error while loading. Please reload this page.
| a :c:expr:`const char*` UTF-8 encoded bytes string and return true if they | ||
| are equal or false otherwise. |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
| a :c:expr:`const char*` UTF-8 encoded bytes string and return true if they | |
| are equal or false otherwise. | |
| a :c:expr:`const char*` UTF-8 encoded bytes string and return non-zero if they | |
| are equal or 0 otherwise. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| } | ||
| else if (ch < 0x800) { | ||
| if ((0xc0 | (ch >> 6)) != (unsigned char)*str++ || | ||
| (0x80 | (ch & 0x3f)) != (unsigned char)*str++) |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
unsigned char byte1 = (0xc0 | (ch >> 6));
unsigned char byte2 = (0x80 | (ch & 0x3f));
if (str[0] != byte1 || str[1] != byte2) return 0;
And declare a str variable as unsigned char* once to avoid casting str at each byte comparison.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
If the first comparison fails, you do not need to calculate the second byte. The code looks more compact and uniform in the way it is written right now. All expressions I copied from the UTF-8 encoder which I wrote 11 years ago, so no need to recheck them. Casting to unsigned char is not a large burden, but if you prefer, I can introduce a new unsigned char* variable.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Co-authored-by: Victor Stinner <[email protected]>
There was an error while loading. Please reload this page.
|
|
||
| .. c:function:: int PyUnicode_EqualToUTF8(PyObject *unicode, const char *string) | ||
|
|
||
| Compare a Unicode object with a UTF-8 encoded C string and return true (``1``) |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
| Compare a Unicode object with a UTF-8 encoded C string and return true (``1``) | |
| Compare a Unicode object with a UTF-8 encoded or ASCII encoding C string and return true (``1``) |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Maybe "ASCII encoded"?
Sorry, something went wrong.
There was an error while loading. Please reload this page.
| assert(str); | ||
| if (PyUnicode_IS_ASCII(unicode)) { | ||
| size_t len = (size_t)PyUnicode_GET_LENGTH(unicode); | ||
| return strlen(str) == len && |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
is more readable than simple return a && b;?
For me, it's easier to reason about a single test per line when I review code.
Keep a && b if you prefer.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| assert(str); | ||
| if (PyUnicode_IS_ASCII(unicode)) { | ||
| size_t len = (size_t)PyUnicode_GET_LENGTH(unicode); | ||
| return strlen(str) == len && |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
The readability problem as I see it, is that your && use has side effects; it is not a pure logic expression.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
I tried to rewrite the code in more vertically sparse way: Detailsint PyUnicode_EqualToUTF8(PyObject *unicode, const char *str) { assert(_PyUnicode_CHECK(unicode)); assert(str); if (PyUnicode_IS_ASCII(unicode)) { size_t len = (size_t)PyUnicode_GET_LENGTH(unicode); if (strlen(str) != len) { return 0; } if (memcmp(PyUnicode_1BYTE_DATA(unicode), str, len) != 0) { return 0; } return 1; } if (PyUnicode_UTF8(unicode) != NULL) { size_t len = (size_t)PyUnicode_UTF8_LENGTH(unicode); if (strlen(str) != len) { return 0; } if (memcmp(PyUnicode_UTF8(unicode), str, len) != 0) { return 0; } return 1; } const unsigned char *s = (const unsigned char *)str; Py_ssize_t len = PyUnicode_GET_LENGTH(unicode); int kind = PyUnicode_KIND(unicode); const void *data = PyUnicode_DATA(unicode); /* Compare Unicode string and UTF-8 string */ for (Py_ssize_t i = 0; i < len; i++) { Py_UCS4 ch = PyUnicode_READ(kind, data, i); if (ch == 0) { return 0; } else if (ch < 0x80) { if (s[0] != ch) { return 0; } s += 1; } else if (ch < 0x800) { if (s[0] != (0xc0 | (ch >> 6))) { return 0; } if (s[1] != (0x80 | (ch & 0x3f))) { return 0; } s += 2; } else if (ch < 0x10000) { if (Py_UNICODE_IS_SURROGATE(ch)) { return 0; } if (s[0] != (0xe0 | (ch >> 12))) { return 0; } if (s[1] != (0x80 | ((ch >> 6) & 0x3f))) { return 0; } if (s[2] != (0x80 | (ch & 0x3f))) { return 0; } s += 3; } else { assert(ch <= MAX_UNICODE); if (s[0] != (0xf0 | (ch >> 18))) { return 0; } if (s[1] != (0x80 | ((ch >> 12) & 0x3f))) { return 0; } if (s[2] != (0x80 | ((ch >> 6) & 0x3f))) { return 0; } if (s[3] != (0x80 | (ch & 0x3f))) { return 0; } s += 4; } } return *s == 0; } |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| # CRASHES equaltoutf8(b'abc', b'abc') | ||
| # CRASHES equaltoutf8([], b'abc') | ||
| # CRASHES equaltoutf8(NULL, b'abc') | ||
| # CRASHES equaltoutf8('abc') # NULL |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
| # CRASHES equaltoutf8('abc') # NULL | |
| # CRASHES equaltoutf8('abc', NULL) |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
No, it does not work so.
NULL is defined as None, and equaltoutf8('abc', None) is a TypeError.
If equaltoutf8() is called with only one argument, it sets the second argument for PyUnicode_EqualToUTF8() to NULL, so we can test it and ensure that it indeed crashes. It is a common approach used in other tests in this file for const char * argument. Some functions do not crash, but raise exception or return successfully for NULL, but this function simply crashes in debug build.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Oh ok, I thought that they were just pseudo-code as comments. Sure, you can leave # NULL if you prefer.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I copied this pattern from the test for PyUnicode_CompareWithASCIIString() which was one of the first written tests. In newer tests I use "z#" which allows to pass None for NULL. Or perhaps I changed this everywhere except the test for PyUnicode_CompareWithASCIIString(). So perhaps I can change this too.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
Co-authored-by: Victor Stinner <[email protected]>
|
I prepared a PR to add this function to Python 2.7-3.12 in the pythoncapi-compat project: python/pythoncapi-compat#78 I chose to write a simple implementation: It's tempting to ask you to modify the API to return -1 on error, but on the other side I hate APIs with simple tasks like "compare two strings" which can fail :-( Most people simply... don't check for errors. So well, I like the propose API, function which cannot fail. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Oh, other features of this implementation:
|
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
LGTM. I just left a few more minor comments.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| # CRASHES equaltoutf8(b'abc', b'abc') | ||
| # CRASHES equaltoutf8([], b'abc') | ||
| # CRASHES equaltoutf8(NULL, b'abc') | ||
| # CRASHES equaltoutf8('abc') # NULL |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Oh ok, I thought that they were just pseudo-code as comments. Sure, you can leave # NULL if you prefer.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
|
IMO we ned a general strategy around dealing with strings. Let's not solve just for PyUnicode_Equal, but design something that we'll also use for, say, dict and attribute lookup. Having two functions, for for both zero-terminated str and for separate length argument, sounds good to me. And we also want a third one that takes Which of those should be in what kind of C-API? Which should be in stable ABI, which can just be inline functions? What should the naming conventions be? Is the |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
The 3 flavors should be exposed as regular function calls. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Would you mind to elaborate why/how using null terminated C string became a bad thing in 2023? |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
"Became a bad thing in 2023" is your interpretation. It has always been a design mistake, but it becomes even more glaring when interoperating with other languages which made the correct decision (that is, strings in those languages store their size explicitly). In the distant times when the CPython C API was only called from C software, expecting null-terminated strings was fine, but it's not anymore. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
I don't thin that it's worth to argue. We should just add an API without size, and an API with a size. That's all. The API without size is at least needed to upgrade all users of _PyUnicode_Equal() and _PyUnicode_EqualToASCIIId(), removed in Python 3.13. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Ah... I'm reassured, thank you. |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
Oh, apparently this PR is now discussed at https://discuss.python.org/t/new-pyunicode-equaltoutf8-function/35377 |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
| s += 4; | ||
| } | ||
| } | ||
| return *s == 0; |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
I suppose that if we return true at this point then we know that str is the utf8 representation of unicode, does it make sense to copy the contents into unicode->utf8 so that future operations can fast-path without needing to encode again?
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
It needs a separate research and discussion. The disadvantage is that it increases the consumed memory size, also it consumes some CPU time, so the benefit will be only if the UTF-8 cache is used in future.
If the idea turned out to be good, it can simply be implemented in the future.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Makes total sense. I guess this also sits in an awkward place where it's likely that the user is best suited to know whether or not they want the utf-8 cache populated, but it's also an implementation detail that we don't really want to expose to users. For now I'll just mark this comment as resolved. Edit I can't, probably lack permissions I guess.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
PyUnicode_EqualToUTF8() doesn't raise exception and cannot fail. Trying to allocate memory should not raise memory, but it sounds like a non-trivial side effect.
Worst case: 1 GB string, you call PyUnicode_EqualToUTF8() and suddenly, Python allocates 1 GB more. I would be surprised by this behavior.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Maybe it's worth it to add a comment explaining why we don't cache the UTF-8 encoded string.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
Co-authored-by: Antoine Pitrou <[email protected]>
There was an error while loading. Please reload this page.
|
|
||
|
|
||
| .. c:function:: int PyUnicode_EqualToUTF8(PyObject *unicode, const char *string) | ||
| .. c:function:: int PyUnicode_EqualToUTF8AndSize(PyObject *unicode, const char *string, Py_ssize_t size) |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
What do you think about renaming string to utf8_str? The utf8_ would be another way to document that it's expected to be encoded to UTF-8 and also it's easier (for me) to distinguish that the second argument is a bytes string, since string name is quite generic.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
It is a part of the bigger issue. See #62897.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
LGTM the updated PR which now also adds PyUnicode_EqualToUTF8AndSize(). You just have to fix the merge conflict.
So far, I didn't see any real blocker issue in the healthy discussion.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
Offending docstrings were removed; dismissing my request for changes
|
@pitrou, does it look good to you now? |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
| [function.PyUnicode_EqualToUTF8] | ||
| added = '3.13' | ||
| [function.PyUnicode_EqualToUTF8AndSize] | ||
| added = '3.13' |
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Unrelated question, but is there a plan to generate this file from Doc/data/stable_abi.dat or the reverse?
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
I think that Doc/data/stable_abi.dat is generated from Misc/stable_abi.toml.
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
The reason will be displayed to describe this comment to others. Learn more.
Ah, ok, thank you!
Sorry, something went wrong.
There was an error while loading. Please reload this page.
|
I added these functions to pythoncapi-compat: python/pythoncapi-compat@99ab0d3 |
Sorry, something went wrong.
There was an error while loading. Please reload this page.
There was an error while loading. Please reload this page.
Successfully merging this pull request may close these issues.
There was an error while loading. Please reload this page.