-
Notifications
You must be signed in to change notification settings - Fork 44
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Python3 compatibility fixes #284
Merged
Merged
Changes from 31 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
f30695d
Python 3 compatibility
a0b54f2
Python 3 compatibility
c05e2c4
Python 3 compatibility
0287cad
Python 3 Compatibility
9838127
Python 3 compatibility
1fb7e72
Python 3 compatibility
2cd1509
Python 3 compatibility
67f76f3
Python 3 compatibility
903f48b
Python 3 compatibility
c1f66e0
Python 3 compatibility
f950f42
Python 3 compatibility
d43a075
Python 3 compatibility
3aebe74
Python 3 compatibility
c9e571b
Python 3 compatibility
9acbd4d
Python 3 compatibility fixes
efbae1e
Fixed issues with python 3 string in font_manager
6b62549
Extra modifications
dc2e3e6
Merge branch 'master' into test
58a690d
Forgot to add a import six.
jdeschenes 2a7983e
Several fixes for py3
jdeschenes fd4fd79
All unit tests passes.
jdeschenes fc07976
Revisions from comparing master branch.
jdeschenes 7bda4f8
Used proper reason for unittest skip
jdeschenes b015584
Small corrections.
jdeschenes 1967c3c
From comments of @jwiggins, there were extra parenthesis.
e0453eb
Changes from @jwiggins comments.
jdeschenes 412b479
Merge branch 'master' into python3_compat
jdeschenes dffcaa5
Changes from @jwiggins comments.
jdeschenes a8e9605
Removed six.itervalues, iterkeys and iteritems where unnecessary
jdeschenes 7afc595
Merge branch 'master' into python3_compat
jdeschenes e3830f0
Forgot one iteritems
jdeschenes 4ea95a5
Another round of comments from @jwiggins
812b243
Added missing parenthesis.
jdeschenes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
|
||
from __future__ import with_statement | ||
|
||
import six | ||
|
||
from numpy import array, pi | ||
|
||
# Enthought library imports | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,8 @@ | |
Define the base Enable object traits | ||
""" | ||
|
||
import six | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also unused here |
||
# Major library imports | ||
from numpy import arange, array | ||
|
||
|
@@ -75,7 +77,7 @@ | |
'dot': array( [ 2.0, 2.0 ] ), | ||
'long dash': array( [ 9.0, 5.0 ] ) | ||
} | ||
__line_style_trait_map_keys = __line_style_trait_values.keys() | ||
__line_style_trait_map_keys = list(__line_style_trait_values.keys()) | ||
LineStyleEditor = EnumEditor( values=__line_style_trait_map_keys) | ||
|
||
def __line_style_trait( value='solid', **metadata ): | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This import is unused here.