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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
f75b953a
Commit
f75b953a
authored
15 years ago
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverted accidental left-over in last commit
parent
0c584f69
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+1
-2
No files found.
Cython/Compiler/PyrexTypes.py
View file @
f75b953a
...
@@ -2034,8 +2034,7 @@ def spanning_type(type1, type2):
...
@@ -2034,8 +2034,7 @@ def spanning_type(type1, type2):
# external types are unsafe, so we use PyObject instead
# external types are unsafe, so we use PyObject instead
return
py_object_type
return
py_object_type
return
type1
return
type1
elif
type2
.
assignable_from
(
type1
)
and
\
elif
type2
.
assignable_from
(
type1
):
not
(
type2
.
is_typedef
and
type2
.
typedef_is_external
):
if
type2
.
is_extension_type
and
type2
.
typeobj_is_imported
():
if
type2
.
is_extension_type
and
type2
.
typeobj_is_imported
():
# external types are unsafe, so we use PyObject instead
# external types are unsafe, so we use PyObject instead
return
py_object_type
return
py_object_type
...
...
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