equal
deleted
inserted
replaced
30 + basename = os.path.basename(path); |
30 + basename = os.path.basename(path); |
31 + return os.path.join(dirname, "64", basename + so_ext) |
31 + return os.path.join(dirname, "64", basename + so_ext) |
32 |
32 |
33 def get_export_symbols (self, ext): |
33 def get_export_symbols (self, ext): |
34 """Return the list of symbols that a shared extension has to |
34 """Return the list of symbols that a shared extension has to |
35 --- Python-2.7.6/Python/import.c.~1~ 2013-11-09 23:36:41.000000000 -0800 |
35 --- Python-2.7.10/Python/import.c.~1~ 2015-05-10 10:17:01 -0800 |
36 +++ Python-2.7.6/Python/import.c 2014-05-14 12:53:34.233016586 -0700 |
36 +++ Python-2.7.10/Python/import.c 2015-05-18 14:28:34 -0700 |
37 @@ -1288,6 +1288,57 @@ |
37 @@ -1292,6 +1292,57 @@ |
38 static int find_init_module(char *); /* Forward */ |
38 static int find_init_module(char *); /* Forward */ |
39 static struct filedescr importhookdescr = {"", "", IMP_HOOK}; |
39 static struct filedescr importhookdescr = {"", "", IMP_HOOK}; |
40 |
40 |
41 +#ifdef HAVE_STAT |
41 +#ifdef HAVE_STAT |
42 +static char * |
42 +static char * |
90 +#endif |
90 +#endif |
91 + |
91 + |
92 static struct filedescr * |
92 static struct filedescr * |
93 find_module(char *fullname, char *subname, PyObject *path, char *buf, |
93 find_module(char *fullname, char *subname, PyObject *path, char *buf, |
94 size_t buflen, FILE **p_fp, PyObject **p_loader) |
94 size_t buflen, FILE **p_fp, PyObject **p_loader) |
95 @@ -1302,11 +1353,10 @@ |
95 @@ -1306,11 +1357,10 @@ |
96 static struct filedescr fd_builtin = {"", "", C_BUILTIN}; |
96 static struct filedescr fd_builtin = {"", "", C_BUILTIN}; |
97 static struct filedescr fd_package = {"", "", PKG_DIRECTORY}; |
97 static struct filedescr fd_package = {"", "", PKG_DIRECTORY}; |
98 char *name; |
98 char *name; |
99 -#if defined(PYOS_OS2) |
99 -#if defined(PYOS_OS2) |
100 size_t saved_len; |
100 size_t saved_len; |
103 -#endif |
103 -#endif |
104 + |
104 + |
105 if (p_loader != NULL) |
105 if (p_loader != NULL) |
106 *p_loader = NULL; |
106 *p_loader = NULL; |
107 |
107 |
108 @@ -1513,15 +1563,17 @@ |
108 @@ -1517,15 +1567,17 @@ |
109 } |
109 } |
110 } |
110 } |
111 } |
111 } |
112 -#if defined(PYOS_OS2) |
112 -#if defined(PYOS_OS2) |
113 /* take a snapshot of the module spec for restoration |
113 /* take a snapshot of the module spec for restoration |
123 + len += modify_path(fdp, buf, buflen); |
123 + len += modify_path(fdp, buf, buflen); |
124 +#endif |
124 +#endif |
125 #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING) |
125 #if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING) |
126 /* OS/2 limits DLLs to 8 character names (w/o |
126 /* OS/2 limits DLLs to 8 character names (w/o |
127 extension) |
127 extension) |
128 @@ -1562,21 +1614,20 @@ |
128 @@ -1566,21 +1618,20 @@ |
129 fp = NULL; |
129 fp = NULL; |
130 } |
130 } |
131 } |
131 } |
132 -#if defined(PYOS_OS2) |
132 -#if defined(PYOS_OS2) |
133 + |
133 + |