Fixes Python 3 compatibility issue. #515
Merged
Conversation
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
Codecov Report
@@ Coverage Diff @@
## master #515 +/- ##
==========================================
- Coverage 90.25% 90.17% -0.09%
==========================================
Files 24 24
Lines 4004 4009 +5
==========================================
+ Hits 3614 3615 +1
- Misses 390 394 +4
Continue to review full report at Codecov.
|
akx
requested changes
Aug 3, 2017
babel/dates.py
Outdated
| return self.pattern | ||
|
|
||
| def __str__(self): | ||
| self.__unicode__().encode('utf-8') |
There was a problem hiding this comment.
This statement is missing its return statement.
babel/dates.py
Outdated
| @@ -1215,8 +1214,16 @@ def __init__(self, pattern, format): | |||
| def __repr__(self): | |||
| return '<%s %r>' % (type(self).__name__, self.pattern) | |||
|
|
|||
| def __unicode__(self): | |||
| return self.pattern | |||
| if PY2: | |||
There was a problem hiding this comment.
To be honest, I'd be more comfortable if the PY2 code lived within the functions instead of the class definition changing depending on interpreter version:
def __unicode__(self):
return self.pattern
def __str__(self):
pat = self.pattern
if PY2:
pat = pat.encode('utf-8')
return pat(thanks to @akx).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cf. issue #514