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.

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

Pypy3 #1

Closed
wants to merge 134 commits into from
Closed

Pypy3 #1

wants to merge 134 commits into from

Conversation

mattip
Copy link
Owner

@mattip mattip commented Apr 28, 2022

No description provided.

@mattip
Copy link
Owner Author

mattip commented Apr 28, 2022

CI fails to build, missing PyUnicode_EncodeCodePage in win32/src/PyUnicode.cpp

mhammond and others added 11 commits April 30, 2022 21:04
Which introduced a new set of problems to work around.
This reverts commit e218cc8.

It typically caused CI to run twice for all PRs - one for the
branch and one for the PR itself.
…ll (mhammond#1871)

Do a separate search for the required DLLs and use this to create a more specific and helpful warning message.
Change logic to not insist both DLLs be found in the same folder.
@mattip mattip force-pushed the pypy3 branch 2 times, most recently from 5d5cf7b to c90ae7e Compare May 12, 2022 08:45
CristiFati and others added 3 commits May 16, 2022 11:27
* Rename and cleanup old string conversion functions now Python 2 support
  isn't required and to make "String" less ambiguous.

* Remove dead code that was only used when UNICODE was not defined, because
  it is defined everywhere.
#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030b00
stringObject = tempObject =
PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(stringObject), PyUnicode_GET_SIZE(stringObject), NULL);
#else
// PyUnicode_EncodeMBCS was removed in Py 3.11.
PyObject *unicode = PyUnicode_FromWideChar(PyUnicode_AS_UNICODE(stringObject), -1);
if (unicode == NULL)
return FALSE;
stringObject = tempObject = PyUnicode_EncodeCodePage(CP_ACP, unicode, NULL);
Copy link

Choose a reason for hiding this comment

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

So you know, this was removed in mhammond#1860 , you might wanna pull upstream again

Copy link
Owner Author

Choose a reason for hiding this comment

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

thanks, see #2

setup.py Outdated
@@ -1004,7 +1017,7 @@ def get_ext_filename(self, name):
return "win32\\pythonservice" + extra_exe
elif name.endswith("pythonwin.Pythonwin"):
return "pythonwin\\Pythonwin" + extra_exe
return name.replace(".", "\\") + ".pyd"
return name.replace(".", "\\") + EXT_SUFFIX
Copy link

Choose a reason for hiding this comment

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

This isn't equivalent

>>> import sysconfig
>>> sysconfig.get_config_var("EXT_SUFFIX")
'.cp39-win_amd64.pyd'

Copy link
Owner Author

Choose a reason for hiding this comment

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

fixed in #2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.