-
-
Notifications
You must be signed in to change notification settings - Fork 13
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
V7.3.12 #105
Merged
Merged
V7.3.12 #105
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d592f34
update recipe to v7.3.12 and backport patches to python3.8 v7.3.11
mattip fab923d
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.24.1, and co…
mattip 48d9e62
copy dlls (issue 101)
mattip e22633d
fix for 3.8/3.9 differences
mattip cf6683f
copy compiled test c-extension modules
mattip 652c127
fix and comment test c-extension handling
mattip cfc583b
do not run c-extension creation routines when running tests
mattip 533c532
fixes from review
mattip 8b70c87
remove fix for issue #101, from review
mattip c2e5d62
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.24.1, and co…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| # HG changeset patch | ||
| # User Carl Friedrich Bolz-Tereick <[email protected]> | ||
| # Date 1689079860 -7200 | ||
| # Tue Jul 11 14:51:00 2023 +0200 | ||
| # Branch conda-3.9-v7.3.12 | ||
| # Node ID 163544ab2a142b8e7e040a098ec9013963c9fb64 | ||
| # Parent 3f3f2298ddc56db44bbdb4551ce992d8e9401646 | ||
| #3961: don't uselessly compile a regex for *every* parsed email message. the | ||
| pattern is anyway always the same, apart from a variable prefix. Instead, first | ||
| check the prefix with str.startswith, and only if that returns True, match the | ||
| rest of the regular expression. | ||
|
|
||
| diff -r 3f3f2298ddc5 -r 163544ab2a14 lib-python/3/email/feedparser.py | ||
| --- a/lib-python/3/email/feedparser.py Thu Jun 15 12:31:24 2023 +0300 | ||
| +++ b/lib-python/3/email/feedparser.py Tue Jul 11 14:51:00 2023 +0200 | ||
| @@ -37,6 +37,7 @@ | ||
| headerRE = re.compile(r'^(From |[\041-\071\073-\176]*:|[\t ])') | ||
| EMPTYSTRING = '' | ||
| NL = '\n' | ||
| +boundaryend_re = re.compile(r'(?P<end>--)?(?P<ws>[ \t]*)(?P<linesep>\r\n|\r|\n)?$') | ||
|
|
||
| NeedMoreData = object() | ||
|
|
||
| @@ -329,9 +330,14 @@ | ||
| # this onto the input stream until we've scanned past the | ||
| # preamble. | ||
| separator = '--' + boundary | ||
| - boundaryre = re.compile( | ||
| - '(?P<sep>' + re.escape(separator) + | ||
| - r')(?P<end>--)?(?P<ws>[ \t]*)(?P<linesep>\r\n|\r|\n)?$') | ||
| + # PyPy difference: don't compile a new regular expression for every | ||
| + # single message, instead just use str.startswith and a generic re | ||
| + # this prevents the JIT compiling more and more traces for all the | ||
| + # different (random) boundaries of messages | ||
| + def boundarymatch(line): | ||
| + if not line.startswith(separator): | ||
| + return None | ||
| + return boundaryend_re.match(line, len(separator)) | ||
| capturing_preamble = True | ||
| preamble = [] | ||
| linesep = False | ||
| @@ -343,7 +349,7 @@ | ||
| continue | ||
| if line == '': | ||
| break | ||
| - mo = boundaryre.match(line) | ||
| + mo = boundarymatch(line) | ||
| if mo: | ||
| # If we're looking at the end boundary, we're done with | ||
| # this multipart. If there was a newline at the end of | ||
| @@ -375,13 +381,13 @@ | ||
| if line is NeedMoreData: | ||
| yield NeedMoreData | ||
| continue | ||
| - mo = boundaryre.match(line) | ||
| + mo = boundarymatch(line) | ||
| if not mo: | ||
| self._input.unreadline(line) | ||
| break | ||
| # Recurse to parse this subpart; the input stream points | ||
| # at the subpart's first line. | ||
| - self._input.push_eof_matcher(boundaryre.match) | ||
| + self._input.push_eof_matcher(boundarymatch) | ||
| for retval in self._parsegen(): | ||
| if retval is NeedMoreData: | ||
| yield NeedMoreData |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@isuruf this is the part that copies the 3 dlls in repsonse to #101
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We shouldn't copy them in this package. The copies will have precedence over the ones in
%PREFIX%\Library\binwhich get upgraded through their own conda packages.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise, looks good to me.