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
80135d83
Commit
80135d83
authored
Nov 27, 2009
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #258, extern builtin conflicts.
parent
16e50584
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+1
-1
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+4
-1
No files found.
Cython/Compiler/ExprNodes.py
View file @
80135d83
...
@@ -917,7 +917,7 @@ class StringNode(PyConstNode):
...
@@ -917,7 +917,7 @@ class StringNode(PyConstNode):
is_identifier
=
None
is_identifier
=
None
def
coerce_to
(
self
,
dst_type
,
env
):
def
coerce_to
(
self
,
dst_type
,
env
):
if
dst_type
is
not
py_object_type
and
dst_type
is
not
str_type
:
if
dst_type
is
not
py_object_type
and
not
str_type
.
subtype_of
(
dst_type
)
:
# if dst_type is Builtin.bytes_type:
# if dst_type is Builtin.bytes_type:
# # special case: bytes = 'str literal'
# # special case: bytes = 'str literal'
# return BytesNode(self.pos, value=self.value)
# return BytesNode(self.pos, value=self.value)
...
...
Cython/Compiler/PyrexTypes.py
View file @
80135d83
...
@@ -400,8 +400,11 @@ class BuiltinObjectType(PyObjectType):
...
@@ -400,8 +400,11 @@ class BuiltinObjectType(PyObjectType):
return
src_type
.
name
==
self
.
name
or
(
return
src_type
.
name
==
self
.
name
or
(
src_type
.
name
==
self
.
alternative_name
and
src_type
.
name
==
self
.
alternative_name
and
src_type
.
name
is
not
None
)
src_type
.
name
is
not
None
)
elif
src_type
.
is_extension_type
:
return
(
src_type
.
module_name
==
'__builtin__'
and
src_type
.
name
==
self
.
name
)
else
:
else
:
return
not
src_type
.
is_extension_typ
e
return
Tru
e
def
typeobj_is_available
(
self
):
def
typeobj_is_available
(
self
):
return
True
return
True
...
...
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