Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
3cef721b
Commit
3cef721b
authored
Mar 29, 2002
by
Jack Jansen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow .pyc files as applets as well as .py files. .py files have
priority, for safety reasons.
parent
5053b70d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
Mac/Python/macmain.c
Mac/Python/macmain.c
+9
-4
No files found.
Mac/Python/macmain.c
View file @
3cef721b
...
@@ -476,7 +476,8 @@ PyMac_Initialize(void)
...
@@ -476,7 +476,8 @@ PyMac_Initialize(void)
#if TARGET_API_MAC_OSX
/* Really: TARGET_API_MAC_CARBON */
#if TARGET_API_MAC_OSX
/* Really: TARGET_API_MAC_CARBON */
static
int
static
int
locateResourcePy
(
char
*
resourceName
,
char
*
resourceURLCStr
,
int
length
)
{
locateResourcePy
(
CFStringRef
resourceType
,
char
*
resourceName
,
char
*
resourceURLCStr
,
int
length
)
{
CFBundleRef
mainBundle
=
NULL
;
CFBundleRef
mainBundle
=
NULL
;
CFURLRef
URL
,
absoluteURL
;
CFURLRef
URL
,
absoluteURL
;
CFStringRef
filenameString
,
filepathString
,
rsrcString
;
CFStringRef
filenameString
,
filepathString
,
rsrcString
;
...
@@ -500,7 +501,7 @@ locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
...
@@ -500,7 +501,7 @@ locateResourcePy(char * resourceName, char * resourceURLCStr, int length) {
/* Look for py files in the main bundle by type */
/* Look for py files in the main bundle by type */
arrayRef
=
CFBundleCopyResourceURLsOfType
(
mainBundle
,
arrayRef
=
CFBundleCopyResourceURLsOfType
(
mainBundle
,
CFSTR
(
"py"
)
,
resourceType
,
NULL
);
NULL
);
/* See if there are any filename matches */
/* See if there are any filename matches */
...
@@ -541,18 +542,22 @@ main(int argc, char **argv)
...
@@ -541,18 +542,22 @@ main(int argc, char **argv)
/* First we see whether we have __rawmain__.py and run that if it
/* First we see whether we have __rawmain__.py and run that if it
** is there
** is there
*/
*/
if
(
locateResourcePy
(
"__rawmain__.py"
,
scriptpath
,
1024
))
{
if
(
locateResourcePy
(
CFSTR
(
"py"
),
"__rawmain__.py"
,
scriptpath
,
1024
))
{
/* If we have a raw main we don't do AppleEvent processing.
/* If we have a raw main we don't do AppleEvent processing.
** Notice that this also means we keep the -psn.... argv[1]
** Notice that this also means we keep the -psn.... argv[1]
** value intact. Not sure whether that is important to someone,
** value intact. Not sure whether that is important to someone,
** but you never know...
** but you never know...
*/
*/
script
=
scriptpath
;
script
=
scriptpath
;
}
else
if
(
locateResourcePy
(
CFSTR
(
"pyc"
),
"__rawmain__.pyc"
,
scriptpath
,
1024
))
{
script
=
scriptpath
;
}
else
{
}
else
{
/* Otherwise we look for __main__.py. Whether that is
/* Otherwise we look for __main__.py. Whether that is
** found or not we also process AppleEvent arguments.
** found or not we also process AppleEvent arguments.
*/
*/
if
(
locateResourcePy
(
"__main__.py"
,
scriptpath
,
1024
))
if
(
locateResourcePy
(
CFSTR
(
"py"
),
"__main__.py"
,
scriptpath
,
1024
))
script
=
scriptpath
;
else
if
(
locateResourcePy
(
CFSTR
(
"pyc"
),
"__main__.pyc"
,
scriptpath
,
1024
))
script
=
scriptpath
;
script
=
scriptpath
;
init_common
(
&
argc
,
&
argv
,
0
);
init_common
(
&
argc
,
&
argv
,
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment