Moving to Python3 #547
Merged
Moving to Python3 #547
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
jace
requested changes
Jan 31, 2020
| @@ -324,7 +324,7 @@ def datelocation(self): | |||
| end_date=schedule_end_at_date.strftime("%d %b"), | |||
| year=schedule_end_at_date.year, | |||
| ) | |||
| return u', '.join(filter(None, [daterange, self.location])) | |||
| return ', '.join([_f for _f in [daterange, self.location] if _f]) | |||
funnel/models/proposal.py
Outdated
| @@ -532,7 +532,7 @@ def url_id_name(self): | |||
| likely never be called directly on an instance. It exists for the SQL | |||
| comparator that will be called to load the instance. | |||
| """ | |||
| return unicode(self.url_id) | |||
| return self.url_id | |||
There was a problem hiding this comment.
return str(self.url_id) as it's an integer.
funnel/views/proposal.py
Outdated
| @@ -188,7 +188,7 @@ def view(self): | |||
| delcommentform = DeleteCommentForm() | |||
|
|
|||
| links = [ | |||
| Markup(linkify(unicode(escape(l)))) | |||
| Markup(linkify(escape(l))) | |||
There was a problem hiding this comment.
Needs to be str() as escape returns a HTML string.
funnel/views/schedule.py
Outdated
| dict( | ||
| {'delete_url': session.url_for('delete')} if with_delete_url else {} | ||
| ).items() | ||
| ) |
There was a problem hiding this comment.
This ugly block should be replaced with a single dict and two update operations.
vidya-ram
added a commit
that referenced
this pull request
Nov 23, 2021
* 2to3 changes * bumped python version on travis * added flask-babel2 to requirements * str and dict fix * requests response need to be decoded * Add record key to cypress * remove unicodecsv * qrcode svg needs to be string and not bytes * removed babel2 from requirements Co-authored-by: Vidya Ramakrishnan <vidya@hasgeek.in>
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.
Related to hasgeek/hgapp#39