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
8af6c070
Commit
8af6c070
authored
Aug 23, 2007
by
Georg Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport fix of #1752175.
parent
76e5e7fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
Python/ast.c
Python/ast.c
+2
-0
Python/import.c
Python/import.c
+5
-1
No files found.
Python/ast.c
View file @
8af6c070
...
...
@@ -3115,6 +3115,7 @@ decode_utf8(const char **sPtr, const char *end, char* encoding)
#endif
}
#ifdef Py_USING_UNICODE
static
PyObject
*
decode_unicode
(
const
char
*
s
,
size_t
len
,
int
rawmode
,
const
char
*
encoding
)
{
...
...
@@ -3176,6 +3177,7 @@ decode_unicode(const char *s, size_t len, int rawmode, const char *encoding)
Py_XDECREF
(
u
);
return
v
;
}
#endif
/* s is a Python string literal, including the bracketing quote characters,
* and r &/or u prefixes (if any), and embedded escape sequences (if any).
...
...
Python/import.c
View file @
8af6c070
...
...
@@ -119,15 +119,19 @@ _PyImport_Init(void)
/* prepare _PyImport_Filetab: copy entries from
_PyImport_DynLoadFiletab and _PyImport_StandardFiletab.
*/
#ifdef HAVE_DYNAMIC_LOADING
for
(
scan
=
_PyImport_DynLoadFiletab
;
scan
->
suffix
!=
NULL
;
++
scan
)
++
countD
;
#endif
for
(
scan
=
_PyImport_StandardFiletab
;
scan
->
suffix
!=
NULL
;
++
scan
)
++
countS
;
filetab
=
PyMem_NEW
(
struct
filedescr
,
countD
+
countS
+
1
);
if
(
filetab
==
NULL
)
Py_FatalError
(
"Can't initialize import file table."
);
#ifdef HAVE_DYNAMIC_LOADING
memcpy
(
filetab
,
_PyImport_DynLoadFiletab
,
countD
*
sizeof
(
struct
filedescr
));
#endif
memcpy
(
filetab
+
countD
,
_PyImport_StandardFiletab
,
countS
*
sizeof
(
struct
filedescr
));
filetab
[
countD
+
countS
].
suffix
=
NULL
;
...
...
@@ -1366,7 +1370,7 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
saved_namelen
=
namelen
;
#endif
/* PYOS_OS2 */
for
(
fdp
=
_PyImport_Filetab
;
fdp
->
suffix
!=
NULL
;
fdp
++
)
{
#if defined(PYOS_OS2)
#if defined(PYOS_OS2)
&& defined(HAVE_DYNAMIC_LOADING)
/* OS/2 limits DLLs to 8 character names (w/o
extension)
* so if the name is longer than that and its a
...
...
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