search

sugarlabs / sugar

Sugar GTK shell
GNU General Public License v3.0
255 stars 241 forks source link

Port to Python 3 #805

Closed rhl-bthr closed 5 years ago

rhl-bthr commented 6 years ago

Fixes #787

quozl commented 6 years ago

Thanks. Reviewed to 8166eb0. Not tested. Lost of symbolic constants for os.statvfs is unfortunate; is there any alternative?

rhl-bthr commented 6 years ago

is there any alternative?

None that I could see

manddy commented 5 years ago

@pro-panda i am not getting why there is merge conflicts in src/jarabe/controlpanel/cmd.py?

quozl commented 5 years ago

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 git log with several options or gitk --all, and you'll see that this branch diverged from master some time ago.

Latest commit common to both branches is c36b7fb8fb4acbe30ca118813e7fa90afbb45662.

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.

quozl commented 5 years ago

Did git checkout python3, git rebase -i master, resolved conflicts, and git push --force.

manddy commented 5 years ago

@quozl Is this issue complete or there is anything else to still work on?

Aniket21mathur commented 5 years ago

em.py is removed from master, as well as popwindow commit is merged. Rebased and resolved conflicts with master. Replaced by #844