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
bc4ae58e
Commit
bc4ae58e
authored
Feb 22, 2014
by
Robert Bradshaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More cleanup.
parent
82e48d3a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
Cython/Build/Dependencies.py
Cython/Build/Dependencies.py
+1
-5
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+1
-1
No files found.
Cython/Build/Dependencies.py
View file @
bc4ae58e
...
@@ -2,11 +2,7 @@ import cython
...
@@ -2,11 +2,7 @@ import cython
from
Cython
import
__version__
from
Cython
import
__version__
import
re
,
os
,
sys
,
time
import
re
,
os
,
sys
,
time
try
:
from
glob
import
iglob
from
glob
import
iglob
except
ImportError
:
# Py2.4
from
glob
import
glob
as
iglob
try
:
try
:
import
gzip
import
gzip
...
...
Cython/Compiler/ExprNodes.py
View file @
bc4ae58e
...
@@ -9202,7 +9202,7 @@ class AddNode(NumBinopNode):
...
@@ -9202,7 +9202,7 @@ class AddNode(NumBinopNode):
def
infer_builtin_types_operation
(
self
,
type1
,
type2
):
def
infer_builtin_types_operation
(
self
,
type1
,
type2
):
# b'abc' + 'abc' raises an exception in Py3,
# b'abc' + 'abc' raises an exception in Py3,
# so we can safely infer the Py2 type for bytes here
# so we can safely infer the Py2 type for bytes here
string_types
=
[
bytes_type
,
str_type
,
basestring_type
,
unicode_type
]
# Py2.4 lacks tuple.index(
)
string_types
=
(
bytes_type
,
str_type
,
basestring_type
,
unicode_type
)
if
type1
in
string_types
and
type2
in
string_types
:
if
type1
in
string_types
and
type2
in
string_types
:
return
string_types
[
max
(
string_types
.
index
(
type1
),
return
string_types
[
max
(
string_types
.
index
(
type1
),
string_types
.
index
(
type2
))]
string_types
.
index
(
type2
))]
...
...
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