Skip to content
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

Fixes #111

Merged
merged 7 commits into from Jul 15, 2020
Merged

Fixes #111

merged 7 commits into from Jul 15, 2020

Conversation

Saumya-Mishra9129
Copy link
Member

@Saumya-Mishra9129 Saumya-Mishra9129 commented Jun 20, 2020

  • TypeError: Item 0: Must be number, not str
  • (sugar-activity3:7184): Gtk-WARNING **: 16:25:08.511: Failed to set text from markup due to error parsing markup: Error on line 2: Entity did not end with a semicolon; most likely you used an ampersand character withouxt intending to start an entity — escape ampersand as &
    @quozl @srevinsaju @JuiP Please review.
    This pull requests addresses errors reported by @shaansubbaiah in mailing list.

@Saumya-Mishra9129 Saumya-Mishra9129 changed the title fix TypeError for blob Fixes Jun 20, 2020
@quozl
Copy link
Contributor

quozl commented Jun 20, 2020

In other words, cc9f835 is sugarlabs/collabwrapper@b740323. If it were me, I'd cherry-pick from collabwrapper and then rewrite the commit message for any additional context.

@Saumya-Mishra9129
Copy link
Member Author

In other words, cc9f835 is sugarlabs/collabwrapper@b740323. If it were me, I'd cherry-pick from collabwrapper and then rewrite the commit message for any additional context.

Thanks , Yeah that is a better way. I have changed in 1102aa3

srevinsaju and others added 3 commits June 20, 2020 17:27
blob had been using str in python2.
str in python2 has been changed to bytes in python3.
Use encode to convert the python2 str to python3 bytes.

fixes error raised while testing collaboration:

Traceback (most recent call last):
  File "/usr/share/sugar/activities/Browse.activity/collabwrapper.py", line 688, in __notify_state_cb
    input_stream = self._get_input_stream()
  File "/usr/share/sugar/activities/Browse.activity/collabwrapper.py", line 736, in _get_input_stream
    return Gio.MemoryInputStream.new_from_data(self._blob, None)
TypeError: Item 0: Must be number, not str

Regression introduced in sugarlabs/collabwrapper@1395117
Also Reported by : Shaan Subbaiah <shaansubbaiah.cs18@bmsce.ac.in> in http://lists.sugarlabs.org/archive/sugar-devel/2020-June/058458.html
style.zoom method takes uints as an argument.

Regression introduced in sugarlabs@8b0e072
typing in the address bar causes several of warnings:
(sugar-activity3:7184): Gtk-WARNING **: 16:25:08.511: Failed to set text from markup due to error parsing mar
kup: Error on line 2: Entity did not end with a semicolon; most likely you used an ampersand character withou
t intending to start an entity — escape ampersand as &amp;

Sometimes there can be characters in uri and title such that markup parser can fail to parse the markup.
markup_escape_text escapes text so that the markup parser will parse it.
Less than, greater than, ampersand, etc. will be replaced with the corresponding entities.

Reported by- Shaan Subbaiah <shaansubbaiah.cs18@bmsce.ac.in> in http://lists.sugarlabs.org/archive/sugar-devel/2020-June/058458.html
quozl and others added 2 commits June 28, 2020 19:34
Hard coded integer constants were used instead of enums imported from
TelepathyGLib.

Reported-by: Saumya Mishra <2017230@iiitdmj.ac.in>
hash function accepts bytes object.

Regression caused in sugarlabs@8b0e072 ("Port to Python 3")
@Saumya-Mishra9129
Copy link
Member Author

I am done with changes here. @quozl @chimosky @JuiP @srevinsaju Please Review and suggest.

@quozl
Copy link
Contributor

quozl commented Jul 7, 2020

1f85350 is not the right way to solve the problem of missing methods. Instead the methods and signals should be implemented, even if they are pass. The way you've solved it makes the DummyBrowser class bring in thousands or lines of code from WebKit2.

@chimosky
Copy link
Member

chimosky commented Jul 7, 2020

I agree with @quozl.

Several errors noticed in DummyBrowser because of non-implemented methods
- sugarlabs#75
- sugarlabs#105
- sugarlabs#103

Implement get_allocation and translate_coordinates methods in DummyBrowser
Selecting favorite works as intented for PDF.
Fixes-sugarlabs#75

Tested with Ubuntu 20.04 by - Saumya Mishra <2017230@iiitdmj.ac.in>
@Saumya-Mishra9129
Copy link
Member Author

@quozl @chimosky Please Review 81fe647.

@quozl
Copy link
Contributor

quozl commented Jul 9, 2020

Looks fine, thanks.

@chimosky
Copy link
Member

Reviewed, thanks.

@chimosky chimosky merged commit 8c66ce0 into sugarlabs:master Jul 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants