Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
34eac74e
Commit
34eac74e
authored
6 years ago
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release'
parents
a29411ee
3eb9e2b1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
CHANGES.rst
CHANGES.rst
+1
-1
Cython/Utility/ModuleSetupCode.c
Cython/Utility/ModuleSetupCode.c
+8
-6
No files found.
CHANGES.rst
View file @
34eac74e
...
...
@@ -31,7 +31,7 @@ Other changes
*
Support
for
Python
2.6
was
removed
.
0.29.1
(
2018
-
1
?-??
)
0.29.1
(
2018
-
1
1
-
24
)
===================
Bugs
fixed
...
...
This diff is collapsed.
Click to expand it.
Cython/Utility/ModuleSetupCode.c
View file @
34eac74e
...
...
@@ -935,11 +935,13 @@ static CYTHON_SMALL_CODE int __Pyx_check_single_interpreter(void) {
return
0
;
}
static
CYTHON_SMALL_CODE
int
__Pyx_copy_spec_to_module
(
PyObject
*
spec
,
PyObject
*
moddict
,
const
char
*
from_name
,
const
char
*
to_name
)
{
static
CYTHON_SMALL_CODE
int
__Pyx_copy_spec_to_module
(
PyObject
*
spec
,
PyObject
*
moddict
,
const
char
*
from_name
,
const
char
*
to_name
,
int
allow_none
)
{
PyObject
*
value
=
PyObject_GetAttrString
(
spec
,
from_name
);
int
result
=
0
;
if
(
likely
(
value
))
{
if
(
allow_none
||
value
!=
Py_None
)
{
result
=
PyDict_SetItemString
(
moddict
,
to_name
,
value
);
}
Py_DECREF
(
value
);
}
else
if
(
PyErr_ExceptionMatches
(
PyExc_AttributeError
))
{
PyErr_Clear
();
...
...
@@ -969,10 +971,10 @@ static CYTHON_SMALL_CODE PyObject* ${pymodule_create_func_cname}(PyObject *spec,
if
(
unlikely
(
!
moddict
))
goto
bad
;
// moddict is a borrowed reference
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"loader"
,
"__loader__"
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"origin"
,
"__file__"
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"parent"
,
"__package__"
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"submodule_search_locations"
,
"__path__"
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"loader"
,
"__loader__"
,
1
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"origin"
,
"__file__"
,
1
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"parent"
,
"__package__"
,
1
)
<
0
))
goto
bad
;
if
(
unlikely
(
__Pyx_copy_spec_to_module
(
spec
,
moddict
,
"submodule_search_locations"
,
"__path__"
,
0
)
<
0
))
goto
bad
;
return
module
;
bad:
...
...
This diff is collapsed.
Click to expand it.
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