Skip to content

Commit 75d2e07

Browse files
rickpriceicanhasmath
rickprice
authored and
icanhasmath
committed
Core patch from 3.8.19.1
1 parent 0070da1 commit 75d2e07

19 files changed

+221
-144
lines changed

‎Lib/site.py‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,18 +385,27 @@ def setcopyright():
385385
"Jython is maintained by the Jython developers (www.jython.org).")
386386
else:
387387
builtins.credits = _sitebuiltins._Printer("credits", """\
388+
ActivePython is a Python distribution by ActiveState Software Inc.
388389
Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
389390
for supporting Python development. See www.python.org for more information.""")
390391
files, dirs = [], []
391392
# Not all modules are required to have a __file__ attribute. See
392393
# PEP 420 for more details.
393394
if hasattr(os, '__file__'):
394395
here = os.path.dirname(os.__file__)
395-
files.extend(["LICENSE.txt", "LICENSE"])
396-
dirs.extend([os.path.join(here, os.pardir), here, os.curdir])
396+
files.extend(["LICENSE.txt", "LICENSE", "License.txt"])
397+
dirs.extend(
398+
[os.path.join(here, os.pardir, "Doc"), # dev build and installation on Windows
399+
os.path.join(here, os.pardir, os.pardir, "doc", # APy install on Linux
400+
"python%s.%s" % sys.version_info[:2]),
401+
# APy install on Mac OS X
402+
os.path.join(here, os.pardir, os.pardir, "Resources",
403+
"Python.app", "Contents", "Resources", "English.lproj",
404+
"Help"),
405+
here]) # dev build on Linux
397406
builtins.license = _sitebuiltins._Printer(
398407
"license",
399-
"See https://www.python.org/psf/license/",
408+
"See https://www.activestate.com/activepython/license-agreement",
400409
files, dirs)
401410

402411

‎Mac/BuildScript/build-installer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ def library_recipes():
378378
if getDeptargetTuple() < (10, 5):
379379
result.extend([
380380
dict(
381-
name="Bzip2 1.0.6",
382-
url="http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz",
381+
name="Bzip2 1.0.8",
382+
url="https://camel-sources.s3.amazonaws.com/src/vendor-sources/python-core/bzip2-1.0.8-pysvn.tar.gz",
383383
checksum='00b516f4704d4a7cb50a1d97e6e8e15b',
384384
configure=None,
385385
install='make install CC=%s CXX=%s, PREFIX=%s/usr/local/ CFLAGS="-arch %s"'%(

‎Makefile.pre.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,6 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
14721472
done
14731473
$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
14741474
$(DESTDIR)$(LIBDEST); \
1475-
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
14761475
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
14771476
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
14781477
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
@@ -1624,7 +1623,7 @@ sharedinstall: sharedmods
16241623
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
16251624
--prefix=$(prefix) \
16261625
--install-scripts=$(BINDIR) \
1627-
--install-platlib=$(DESTSHARED) \
1626+
--install-platlib=${exec_prefix}/lib/python$(VERSION)/lib-dynload \
16281627
--root=$(DESTDIR)/
16291628
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
16301629
-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__

‎Modules/_ssl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
985985
_setSSLError(NULL, 0, __FILE__, __LINE__);
986986
return NULL;
987987
}
988-
/* bpo43522 and OpenSSL < 1.1.1l: copy hostflags manually */
988+
/* bpo43522 and OpenSSL < 1.1.1n: copy hostflags manually */
989989
#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION < 0x101010cf
990990
X509_VERIFY_PARAM *ssl_params = SSL_get0_param(self->ssl);
991991
X509_VERIFY_PARAM_set_hostflags(ssl_params, sslctx->hostflags);

‎PCbuild/_bz2.vcxproj‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,43 @@
9292
<PropertyGroup>
9393
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
9494
</PropertyGroup>
95-
<ItemDefinitionGroup>
95+
<ItemDefinitionGroup Condition="$(BZIP2_DIR) != ''">
96+
<ClCompile>
97+
<AdditionalIncludeDirectories>$(bz2Dir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
98+
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
100+
</ClCompile>
101+
<Link>
102+
<AdditionalLibraryDirectories>$(bz2Dir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalDependencies>libbz2.lib;%(AdditionalDependencies)</AdditionalDependencies>
104+
</Link>
105+
</ItemDefinitionGroup>
106+
<ItemDefinitionGroup Condition="$(BZIP2_DIR) == ''">
96107
<ClCompile>
97108
<AdditionalIncludeDirectories>$(bz2Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
98109
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99110
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
100111
</ClCompile>
101112
</ItemDefinitionGroup>
102-
<ItemGroup>
103-
<ClCompile Include="..\Modules\_bz2module.c" />
104-
<ClCompile Include="$(bz2Dir)\blocksort.c" />
105-
<ClCompile Include="$(bz2Dir)\bzlib.c" />
106-
<ClCompile Include="$(bz2Dir)\compress.c" />
107-
<ClCompile Include="$(bz2Dir)\crctable.c" />
108-
<ClCompile Include="$(bz2Dir)\decompress.c" />
109-
<ClCompile Include="$(bz2Dir)\huffman.c" />
110-
<ClCompile Include="$(bz2Dir)\randtable.c" />
111-
</ItemGroup>
113+
<Choose>
114+
<When Condition="$(BZIP2_DIR) == ''">
115+
<ItemGroup>
116+
<ClCompile Include="..\Modules\_bz2module.c" />
117+
<ClCompile Include="$(bz2Dir)\blocksort.c" />
118+
<ClCompile Include="$(bz2Dir)\bzlib.c" />
119+
<ClCompile Include="$(bz2Dir)\compress.c" />
120+
<ClCompile Include="$(bz2Dir)\crctable.c" />
121+
<ClCompile Include="$(bz2Dir)\decompress.c" />
122+
<ClCompile Include="$(bz2Dir)\huffman.c" />
123+
<ClCompile Include="$(bz2Dir)\randtable.c" />
124+
</ItemGroup>
125+
</When>
126+
<Otherwise>
127+
<ItemGroup>
128+
<ClCompile Include="..\Modules\_bz2module.c" />
129+
</ItemGroup>
130+
</Otherwise>
131+
</Choose>
112132
<ItemGroup>
113133
<ClInclude Include="$(bz2Dir)\bzlib.h" />
114134
<ClInclude Include="$(bz2Dir)\bzlib_private.h" />

‎PCbuild/_bz2.vcxproj.filters‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<Filter Include="Source Files">
55
<UniqueIdentifier>{f53a859d-dad2-4d5b-ae41-f28d8b571f5a}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="bzip2 1.0.6 Header Files">
7+
<Filter Include="bzip2 1.0.8 Header Files">
88
<UniqueIdentifier>{7e0bed05-ae33-43b7-8797-656455bbb7f3}</UniqueIdentifier>
99
</Filter>
10-
<Filter Include="bzip2 1.0.6 Source Files">
10+
<Filter Include="bzip2 1.0.8 Source Files">
1111
<UniqueIdentifier>{ed574b89-6983-4cdf-9f98-fe7048d9e89c}</UniqueIdentifier>
1212
</Filter>
1313
</ItemGroup>
@@ -16,33 +16,33 @@
1616
<Filter>Source Files</Filter>
1717
</ClCompile>
1818
<ClCompile Include="$(bz2Dir)\blocksort.c">
19-
<Filter>bzip2 1.0.6 Source Files</Filter>
19+
<Filter>bzip2 1.0.8 Source Files</Filter>
2020
</ClCompile>
2121
<ClCompile Include="$(bz2Dir)\bzlib.c">
22-
<Filter>bzip2 1.0.6 Source Files</Filter>
22+
<Filter>bzip2 1.0.8 Source Files</Filter>
2323
</ClCompile>
2424
<ClCompile Include="$(bz2Dir)\compress.c">
25-
<Filter>bzip2 1.0.6 Source Files</Filter>
25+
<Filter>bzip2 1.0.8 Source Files</Filter>
2626
</ClCompile>
2727
<ClCompile Include="$(bz2Dir)\crctable.c">
28-
<Filter>bzip2 1.0.6 Source Files</Filter>
28+
<Filter>bzip2 1.0.8 Source Files</Filter>
2929
</ClCompile>
3030
<ClCompile Include="$(bz2Dir)\decompress.c">
31-
<Filter>bzip2 1.0.6 Source Files</Filter>
31+
<Filter>bzip2 1.0.8 Source Files</Filter>
3232
</ClCompile>
3333
<ClCompile Include="$(bz2Dir)\huffman.c">
34-
<Filter>bzip2 1.0.6 Source Files</Filter>
34+
<Filter>bzip2 1.0.8 Source Files</Filter>
3535
</ClCompile>
3636
<ClCompile Include="$(bz2Dir)\randtable.c">
37-
<Filter>bzip2 1.0.6 Source Files</Filter>
37+
<Filter>bzip2 1.0.8 Source Files</Filter>
3838
</ClCompile>
3939
</ItemGroup>
4040
<ItemGroup>
4141
<ClInclude Include="$(bz2Dir)\bzlib.h">
42-
<Filter>bzip2 1.0.6 Header Files</Filter>
42+
<Filter>bzip2 1.0.8 Header Files</Filter>
4343
</ClInclude>
4444
<ClInclude Include="$(bz2Dir)\bzlib_private.h">
45-
<Filter>bzip2 1.0.6 Header Files</Filter>
45+
<Filter>bzip2 1.0.8 Header Files</Filter>
4646
</ClInclude>
4747
</ItemGroup>
4848
</Project>

‎PCbuild/_lzma.vcxproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<PropertyGroup>
9292
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
9393
</PropertyGroup>
94-
<ItemDefinitionGroup>
94+
<ItemDefinitionGroup Condition="$(LZMA_DIR) == ''">
9595
<ClCompile>
9696
<AdditionalIncludeDirectories>$(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9797
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -100,6 +100,15 @@
100100
<AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
101101
</Link>
102102
</ItemDefinitionGroup>
103+
<ItemDefinitionGroup Condition="$(LZMA_DIR) != ''">
104+
<ClCompile>
105+
<AdditionalIncludeDirectories>$(lzmaDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106+
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107+
</ClCompile>
108+
<Link>
109+
<AdditionalDependencies>$(lzmaDir)lib\liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
110+
</Link>
111+
</ItemDefinitionGroup>
103112
<ItemGroup>
104113
<ClCompile Include="..\Modules\_lzmamodule.c" />
105114
</ItemGroup>
@@ -111,6 +120,8 @@
111120
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
112121
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
113122
</ProjectReference>
123+
</ItemGroup>
124+
<ItemGroup Condition="$(LZMA_DIR) == ''">
114125
<ProjectReference Include="liblzma.vcxproj">
115126
<Project>{12728250-16eC-4dc6-94d7-e21dd88947f8}</Project>
116127
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎PCbuild/_sqlite3.vcxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,16 @@
9393
</PropertyGroup>
9494
<ItemDefinitionGroup>
9595
<ClCompile>
96-
<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96+
<AdditionalIncludeDirectories>$(sqlite3Dir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9797
<PreprocessorDefinitions>MODULE_NAME="sqlite3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
9898
</ClCompile>
9999
</ItemDefinitionGroup>
100+
<ItemDefinitionGroup Condition="$(SQLITE3_DIR) != ''">
101+
<Link>
102+
<AdditionalLibraryDirectories>$(sqlite3Dir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalDependencies>sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
104+
</Link>
105+
</ItemDefinitionGroup>
100106
<ItemGroup>
101107
<ClInclude Include="..\Modules\_sqlite\cache.h" />
102108
<ClInclude Include="..\Modules\_sqlite\connection.h" />
@@ -122,7 +128,7 @@
122128
<ItemGroup>
123129
<ResourceCompile Include="..\PC\python_nt.rc" />
124130
</ItemGroup>
125-
<ItemGroup>
131+
<ItemGroup Condition="$(SQLITE3_DIR) == ''">
126132
<ProjectReference Include="pythoncore.vcxproj">
127133
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
128134
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎PCbuild/get_externals.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ echo.Fetching external libraries...
5252

5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.8
55-
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0
55+
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
5656
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1w
57-
set libraries=%libraries% sqlite-3.35.5.0
57+
set libraries=%libraries% sqlite-3.45.1.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6

‎PCbuild/libffi.props‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<_FFI_VER Condition="Exists('$(libffiOutDir)libffi-6.lib')">6</_FFI_VER>
5+
<_FFI_VER Condition="Exists('$(libffiOutDir)libffi-7.lib')">7</_FFI_VER>
6+
<_FFI_VER Condition="Exists('$(libffiOutDir)libffi-8.lib')">8</_FFI_VER>
7+
</PropertyGroup>
38
<ItemDefinitionGroup>
49
<ClCompile>
510
<AdditionalIncludeDirectories>$(libffiIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
611
</ClCompile>
712
<Link>
813
<AdditionalLibraryDirectories>$(libffiOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9-
<AdditionalDependencies>libffi-7.lib;%(AdditionalDependencies)</AdditionalDependencies>
14+
<AdditionalDependencies>libffi-$(_FFI_VER).lib;%(AdditionalDependencies)</AdditionalDependencies>
1015
</Link>
1116
</ItemDefinitionGroup>
1217
<ItemGroup>
13-
<_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
18+
<_LIBFFIDLL Include="$(libffiOutDir)\libffi-$(_FFI_VER).dll" />
1419
</ItemGroup>
1520
<Target Name="_CopyLIBFFIDLL" Inputs="@(_LIBFFIDLL)" Outputs="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
1621
<Copy SourceFiles="@(_LIBFFIDLL)" DestinationFolder="$(OutDir)" />

0 commit comments

Comments
 (0)