Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b3be216

Browse files
jackjansenjackjansen
committed
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
1 parent 69b83b1 commit b3be216

53 files changed

Lines changed: 1815 additions & 300 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Lib/test/regrtest.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@ def tolist(self, sorted=1):
524524
test_cl
525525
test_commands
526526
test_crypt
527+
test_curses
527528
test_dbm
528529
test_dl
529530
test_fcntl

‎Mac/Build/PythonCore.exp‎

Lines changed: 75 additions & 66 deletions
Large diffs are not rendered by default.

‎Mac/Build/PythonCore.mcp‎

-2.59 KB
Binary file not shown.

‎Mac/Build/PythonCoreCarbon.exp‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ PyNumber_Or
313313
PyNumber_Check
314314
PyObject_AsWriteBuffer
315315
PyObject_AsReadBuffer
316+
PyObject_CheckReadBuffer
316317
PyObject_AsCharBuffer
317318
PyObject_DelItem
318319
PyObject_SetItem
@@ -1077,7 +1078,6 @@ PyStructSequence_New
10771078
GUSISetupConsoleStdio
10781079
GUSIStdioFlush
10791080
GUSIStdioClose
1080-
_fdopen
10811081
__close_console
10821082
__close_file
10831083
__position_file
@@ -1146,6 +1146,7 @@ __vt__18GUSIContextFactory # GUSIContextFactory::__vt
11461146
__vt__11GUSIContext # GUSIContext::__vt
11471147
sError__11GUSIContext # GUSIContext::sError
11481148
sHasThreading__11GUSIContext # GUSIContext::sHasThreading
1149+
sCreatingCurrentContext__11GUSIContext # GUSIContext::sCreatingCurrentContext
11491150
sCurrentContext__11GUSIContext # GUSIContext::sCurrentContext
11501151
sContexts__11GUSIContext # GUSIContext::sContexts
11511152
sInstance__11GUSIProcess # GUSIProcess::sInstance
@@ -1154,9 +1155,9 @@ MakeInstance__22GUSIThreadManagerProxyFv # GUSIThreadManagerProxy::MakeInstance
11541155
__dt__22GUSIThreadManagerProxyFv # GUSIThreadManagerProxy::~GUSIThreadManagerProxy()
11551156
__dt__Q23std76auto_ptr<22GUSIThreadManagerProxy,Q23std33_Single<22GUSIThreadManagerProxy>>Fv # std::auto_ptr<GUSIThreadManagerProxy, std::_Single<GUSIThreadManagerProxy>>::~auto_ptr()
11561157
Instance__22GUSIThreadManagerProxyFv # GUSIThreadManagerProxy::Instance()
1157-
SetThreadTerminator__22GUSIThreadManagerProxyFUlPFUlPv_vPv # GUSIThreadManagerProxy::SetThreadTerminator(unsigned long,void (*)(unsigned long, void*),void*)
1158-
SetThreadSwitcher__22GUSIThreadManagerProxyFUlPFUlPv_vPvUc # GUSIThreadManagerProxy::SetThreadSwitcher(unsigned long,void (*)(unsigned long, void*),void*,unsigned char)
1159-
NewThread__22GUSIThreadManagerProxyFUlPFPv_PvPvlUlPPvPUl # GUSIThreadManagerProxy::NewThread(unsigned long,void* (*)(void*),void*,long,unsigned long,void**,unsigned long*)
1158+
SetThreadTerminator__22GUSIThreadManagerProxyFUlP30OpaqueThreadTerminationProcPtrPv # GUSIThreadManagerProxy::SetThreadTerminator(unsigned long,OpaqueThreadTerminationProcPtr*,void*)
1159+
SetThreadSwitcher__22GUSIThreadManagerProxyFUlP25OpaqueThreadSwitchProcPtrPvUc # GUSIThreadManagerProxy::SetThreadSwitcher(unsigned long,OpaqueThreadSwitchProcPtr*,void*,unsigned char)
1160+
NewThread__22GUSIThreadManagerProxyFUlP24OpaqueThreadEntryProcPtrPvlUlPPvPUl # GUSIThreadManagerProxy::NewThread(unsigned long,OpaqueThreadEntryProcPtr*,void*,long,unsigned long,void**,unsigned long*)
11601161
GUSIControl__FP7IOParam # GUSIControl(IOParam*)
11611162
GUSIFinishIO__FP7IOParam # GUSIFinishIO(IOParam*)
11621163
GUSIStartIO__FP7IOParam # GUSIStartIO(IOParam*)
@@ -1171,26 +1172,27 @@ Done__11GUSIContextFb # GUSIContext::Done(bool)
11711172
Terminate__11GUSIContextFv # GUSIContext::Terminate()
11721173
SwitchOut__11GUSIContextFv # GUSIContext::SwitchOut()
11731174
SwitchIn__11GUSIContextFv # GUSIContext::SwitchIn()
1174-
SetTerminator__11GUSIContextFPFUlPv_vPv # GUSIContext::SetTerminator(void (*)(unsigned long, void*),void*)
1175+
SetTerminator__11GUSIContextFP30OpaqueThreadTerminationProcPtrPv # GUSIContext::SetTerminator(OpaqueThreadTerminationProcPtr*,void*)
11751176
GUSISetThreadTerminator
1176-
SetSwitchOut__11GUSIContextFPFUlPv_vPv # GUSIContext::SetSwitchOut(void (*)(unsigned long, void*),void*)
1177-
SetSwitchIn__11GUSIContextFPFUlPv_vPv # GUSIContext::SetSwitchIn(void (*)(unsigned long, void*),void*)
1177+
SetSwitchOut__11GUSIContextFP25OpaqueThreadSwitchProcPtrPv # GUSIContext::SetSwitchOut(OpaqueThreadSwitchProcPtr*,void*)
1178+
SetSwitchIn__11GUSIContextFP25OpaqueThreadSwitchProcPtrPv # GUSIContext::SetSwitchIn(OpaqueThreadSwitchProcPtr*,void*)
11781179
GUSISetThreadSwitcher
11791180
CreateContext__18GUSIContextFactoryFUl # GUSIContextFactory::CreateContext(unsigned long)
1180-
CreateContext__18GUSIContextFactoryFPFPv_PvPvlUlPPvPUl # GUSIContextFactory::CreateContext(void* (*)(void*),void*,long,unsigned long,void**,unsigned long*)
1181+
CreateContext__18GUSIContextFactoryFP24OpaqueThreadEntryProcPtrPvlUlPPvPUl # GUSIContextFactory::CreateContext(OpaqueThreadEntryProcPtr*,void*,long,unsigned long,void**,unsigned long*)
11811182
__dt__18GUSIContextFactoryFv # GUSIContextFactory::~GUSIContextFactory()
11821183
__ct__18GUSIContextFactoryFv # GUSIContextFactory::GUSIContextFactory()
1183-
__dt__Q23std68auto_ptr<18GUSIContextFactory,Q23std29_Single<18GUSIContextFactory>>Fv # std::auto_ptr<GUSIContextFactory, std::_Single<GUSIContextFactory>>::~auto_ptr()
1184+
DeleteInstance__18GUSIContextFactoryFv # GUSIContextFactory::DeleteInstance()
11841185
SetInstance__18GUSIContextFactoryFP18GUSIContextFactory # GUSIContextFactory::SetInstance(GUSIContextFactory*)
11851186
Instance__18GUSIContextFactoryFv # GUSIContextFactory::Instance()
1187+
GUSISetupContextFactory
11861188
GUSINewThread
11871189
Wakeup__11GUSIProcessFv # GUSIProcess::Wakeup()
11881190
Wakeup__11GUSIContextFv # GUSIContext::Wakeup()
11891191
Liquidate__11GUSIContextFv # GUSIContext::Liquidate()
11901192
LiquidateAll__Q211GUSIContext5QueueFv # GUSIContext::Queue::LiquidateAll()
11911193
__dt__11GUSIContextFv # GUSIContext::~GUSIContext()
11921194
Lookup__11GUSIContextFUl # GUSIContext::Lookup(unsigned long)
1193-
__ct__11GUSIContextFPFPv_PvPvlUlPPvPUl # GUSIContext::GUSIContext(void* (*)(void*),void*,long,unsigned long,void**,unsigned long*)
1195+
__ct__11GUSIContextFP24OpaqueThreadEntryProcPtrPvlUlPPvPUl # GUSIContext::GUSIContext(OpaqueThreadEntryProcPtr*,void*,long,unsigned long,void**,unsigned long*)
11941196
__ct__11GUSIContextFUl # GUSIContext::GUSIContext(unsigned long)
11951197
FinishSetup__11GUSIContextFv # GUSIContext::FinishSetup()
11961198
GUSIThreadTerminator
@@ -1231,6 +1233,9 @@ __dt__19GUSIDescriptorTableFv # GUSIDescriptorTable::~GUSIDescriptorTable()
12311233
CloseAllDescriptors__19GUSIDescriptorTableFv # GUSIDescriptorTable::CloseAllDescriptors()
12321234
SetInstance__19GUSIDescriptorTableFP19GUSIDescriptorTable # GUSIDescriptorTable::SetInstance(GUSIDescriptorTable*)
12331235
Instance__19GUSIDescriptorTableFv # GUSIDescriptorTable::Instance()
1236+
GUSISetupDescriptorTable
1237+
__ct__10GUSIDeviceFv # GUSIDevice::GUSIDevice()
1238+
__ct__14GUSINullDeviceFv # GUSINullDevice::GUSINullDevice()
12341239
Instance__14GUSINullDeviceFv # GUSINullDevice::Instance()
12351240
GUSIDefaultSetupConsole
12361241
GUSISetupConsole
@@ -1360,6 +1365,7 @@ __ct__12GUSIFileSpecFRC6FSSpecb # GUSIFileSpec::GUSIFileSpec(const FSSpec&,bool
13601365
__ct__12GUSIFileSpecFRC12GUSIFileSpec # GUSIFileSpec::GUSIFileSpec(const GUSIFileSpec&)
13611366
CScratch__12GUSIFileSpecFb # GUSIFileSpec::CScratch(bool)
13621367
ReadHex__FPCciPc # ReadHex(const char*,int,char*)
1368+
GUSIFSXGetVolInfo__FP31GUSIIOPBWrapper<12XVolumeParam> # GUSIFSXGetVolInfo(GUSIIOPBWrapper<XVolumeParam>*)
13631369
GUSIFSMoveRename
13641370
GUSIFSCatMove
13651371
GUSIFSCatMove__FPC6FSSpecl # GUSIFSCatMove(const FSSpec*,long)
@@ -1521,7 +1527,7 @@ GUSIwithLocalSockets
15211527
__vt__12GUSIGatherer # GUSIGatherer::__vt
15221528
__vt__13GUSIScatterer # GUSIScatterer::__vt
15231529
get__40GUSISpecificData<Q23std2tm,&.GUSIKillTM>FP17GUSISpecificTable # GUSISpecificData<std::tm, &.GUSIKillTM>::get(GUSISpecificTable*)
1524-
faccess__FPCcPUiPv # faccess(const char*,unsigned int*,void*)
1530+
faccess
15251531
fsetfileinfo
15261532
fgetfileinfo
15271533
getservent
@@ -1811,6 +1817,7 @@ __ct__18GUSIOTStreamSocketFP14GUSIOTStrategy # GUSIOTStreamSocket::GUSIOTStream
18111817
Supports__12GUSIOTSocketFQ210GUSISocket12ConfigOption # GUSIOTSocket::Supports(GUSISocket::ConfigOption)
18121818
setsockopt__12GUSIOTSocketFiiPvUi # GUSIOTSocket::setsockopt(int,int,void*,unsigned int)
18131819
getsockopt__12GUSIOTSocketFiiPvPUi # GUSIOTSocket::getsockopt(int,int,void*,unsigned int*)
1820+
pre_select__12GUSIOTSocketFbbb # GUSIOTSocket::pre_select(bool,bool,bool)
18141821
ioctl__12GUSIOTSocketFUiPc # GUSIOTSocket::ioctl(unsigned int,char*)
18151822
fcntl__12GUSIOTSocketFiPc # GUSIOTSocket::fcntl(int,char*)
18161823
shutdown__12GUSIOTSocketFi # GUSIOTSocket::shutdown(int)
@@ -2223,6 +2230,7 @@ _umask
22232230
_ftype
22242231
_fcreator
22252232
_chmod
2233+
_fdopen
22262234
__gettype
22272235
__getcreator
22282236
__ctopstring

‎Mac/Build/PythonStandSmall.mcp‎

6.32 KB
Binary file not shown.

‎Mac/Build/_dummy_tkinter.mcp‎

0 Bytes
Binary file not shown.

‎Mac/Distributions/(vise)/Python 2.2.vct‎

606 Bytes
Binary file not shown.

‎Mac/Distributions/dev.exclude‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.hqx
77
*.idb
88
*.pyc
9+
*.pyo
910
*.slb
1011
*.xMAP
1112
*.xSYM
@@ -16,4 +17,3 @@
1617
@*
1718
CVS
1819
[(]*[)]
19-
*.pyo

‎Mac/Distributions/dev.include‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,12 @@
223223
(':Mac:Build:_Win.mcp.xml', None)
224224
(':Mac:Build:_dummy_tkinter.mcp', None)
225225
(':Mac:Build:_dummy_tkinter.mcp.exp', None)
226+
(':Mac:Build:_hotshot.carbon.mcp', None)
227+
(':Mac:Build:_hotshot.carbon.mcp.exp', None)
228+
(':Mac:Build:_hotshot.carbon.mcp.xml', None)
229+
(':Mac:Build:_hotshot.mcp', None)
230+
(':Mac:Build:_hotshot.mcp.exp', None)
231+
(':Mac:Build:_hotshot.mcp.xml', None)
226232
(':Mac:Build:_symtable.carbon.mcp', None)
227233
(':Mac:Build:_symtable.carbon.mcp.exp', None)
228234
(':Mac:Build:_symtable.carbon.mcp.xml', None)
@@ -423,6 +429,7 @@
423429
(':Modules:_codecsmodule.c', None)
424430
(':Modules:_curses_panel.c', None)
425431
(':Modules:_cursesmodule.c', None)
432+
(':Modules:_hotshot.c', None)
426433
(':Modules:_localemodule.c', None)
427434
(':Modules:_sre.c', None)
428435
(':Modules:_testcapimodule.c', None)
@@ -589,10 +596,7 @@
589596
(':readmefiles', None)
590597
(':setup.py', None)
591598
(':site-packages', None)
592-
(':Mac:Build:_hotshot.mcp.xml', None)
593-
(':Mac:Build:_hotshot.mcp.exp', None)
594-
(':Mac:Build:_hotshot.mcp', None)
595-
(':Mac:Build:_hotshot.carbon.mcp.xml', None)
596-
(':Mac:Build:_hotshot.carbon.mcp.exp', None)
597-
(':Mac:Build:_hotshot.carbon.mcp', None)
598-
(':Modules:_hotshot.c', None)
599+
(':Mac:Build:hfsplus.carbon.mcp.xml', None)
600+
(':Mac:Build:hfsplus.carbon.mcp.exp', None)
601+
(':Mac:Build:hfsplus.carbon.mcp', None)
602+
(':Mac:mwerks:mwerks_shlib_config.h', '')

‎Mac/Include/macbuildno.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD 111
1+
#define BUILD 116

0 commit comments

Comments
 (0)