Port to Python 3 #805
Port to Python 3 #805
Conversation
|
Thanks. Reviewed to 8166eb0. Not tested. Lost of symbolic constants for |
None that I could see |
|
@pro-panda i am not getting why there is merge conflicts in src/jarabe/controlpanel/cmd.py? |
|
GitHub does a poor job of showing divergent histories. The best view is Network but you have to somehow look at both sugarlabs and pro-panda repositories at the same time to see the problem. Use a git history visualiser, such as Latest commit common to both branches is c36b7fb. Anyone can fix this. Skills needed are git conflict resolution, or rebasing, combined with a good understanding of the intent of each patch. I'll put this on my list to do today. |
* remove call to sys.setdefaultencoding default encoding is 'utf-8' by default in Python 3 * remove use of statvfs statvfs does not exist in python 3
* TODO was fixed in af6ce2e
|
Did |
|
@quozl Is this issue complete or there is anything else to still work on? |
| @@ -147,6 +147,8 @@ def _entry_activated_cb(self, entry): | |||
| new_query = entry.props.text | |||
| if self._query != new_query: | |||
| self._query = new_query | |||
| if isinstance(self._query, bytes): | |||
There was a problem hiding this comment.
@pro-panda why did you add this line in the code,because it not not related to this issue of porting to a different version @quozl Your suggestions will also be helpful
There was a problem hiding this comment.
@manddy, thanks for asking. The change seems common to me. @pro-panda didn't explain the change in the commit message. I'm not sure why the change is needed though. I've no suggestions.
There was a problem hiding this comment.
Thanks for asking @manddy.
Most of such changes were introduced since sugarlabs/sugar-toolkit-gtk3#383 supported both Python 2 and 3, which implied that you could expect bytes or unicode, depending on the version an interacting sugar activity is written in.
From what I recall, this instance was also implemented for a similar reason.
|
em.py is removed from master, as well as popwindow commit is merged. Rebased and resolved conflicts with master. |
Fixes #787