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
3dfc22cc
Commit
3dfc22cc
authored
Apr 20, 2012
by
Brett Cannon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #14599: Support ImportError.path on AIX and HPUX when loading
extension modules.
parent
fe3c6296
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
Python/dynload_aix.c
Python/dynload_aix.c
+7
-1
Python/dynload_hpux.c
Python/dynload_hpux.c
+11
-1
No files found.
Python/dynload_aix.c
View file @
3dfc22cc
...
...
@@ -108,6 +108,8 @@ aix_loaderror(const char *pathname)
{
char
*
message
[
1024
],
errbuf
[
1024
];
PyObject
*
pathname_ob
=
NULL
;
PyObject
*
errbuf_ob
=
NULL
;
register
int
i
,
j
;
struct
errtab
{
...
...
@@ -147,7 +149,11 @@ aix_loaderror(const char *pathname)
ERRBUF_APPEND
(
"
\n
"
);
}
errbuf
[
strlen
(
errbuf
)
-
1
]
=
'\0'
;
/* trim off last newline */
PyErr_SetString
(
PyExc_ImportError
,
errbuf
);
pathname_ob
=
PyUnicode_FromString
(
pathname
);
errbuf_ob
=
PyUnicode_FromString
(
errbuf
);
PyErr_SetImportError
(
errbuf_ob
,
NULL
,
pathname
);
Py_DECREF
(
pathname_ob
);
Py_DECREF
(
errbuf_ob
);
return
;
}
...
...
Python/dynload_hpux.c
View file @
3dfc22cc
...
...
@@ -36,11 +36,21 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
/* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
if
(
lib
==
NULL
)
{
char
buf
[
256
];
PyObject
*
pathname_ob
=
NULL
;
PyObject
*
buf_ob
=
NULL
;
PyObject
*
shortname_ob
=
NULL
;
if
(
Py_VerboseFlag
)
perror
(
pathname
);
PyOS_snprintf
(
buf
,
sizeof
(
buf
),
"Failed to load %.200s"
,
pathname
);
PyErr_SetString
(
PyExc_ImportError
,
buf
);
buf_ob
=
PyUnicode_FromString
(
buf
);
shortname_ob
=
PyUnicode_FromString
(
shortname
);
pathname_ob
=
PyUnicode_FromString
(
pathname
);
PyErr_SetImportError
(
buf_ob
,
shortname_ob
,
pathname_ob
);
Py_DECREF
(
buf_ob
);
Py_DECREF
(
shortname_ob
);
Py_DECREF
(
pathname_ob
);
return
NULL
;
}
PyOS_snprintf
(
funcname
,
sizeof
(
funcname
),
FUNCNAME_PATTERN
,
shortname
);
...
...
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