Merge lp:~diogenesethecynical/lernid/bug793793_2 into lp:lernid

[Diogenese TheCynical]

Updated with scheme.

[John S. Gruber (jsjgruber)]

Thanks for working on this.

Did you test this latest patch? I'm afraid I can't get it to work.

Also, the usual style for Python is to use spaces rather than tabs. It makes things simpler when various maintainers with varying settings for the meaning of tabs in their editors are working on the same code.

John

review: Needs Fixing

[lp:~diogenesethecynical/lernid/bug793793_2]

230. By Diogenese <email address hidden> on 2011-08-10

Bug 793793 with tab fixed

[Diogenese TheCynical (diogenesethecynical)]

Hi John

Probably something messed up when I was trying to merge in the older branch. I am sorry for this oversight.

Please review this again. I have fixed the tab thing.

[John S. Gruber (jsjgruber)]

Looks good. Thanks again.

review: Approve

=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2011-07-21 05:09:37 +0000
+++ lernid/widgets/Browser.py	2011-08-10 12:13:32 +0000
@@ -26,6 +26,7 @@
 from lernid.widgets.Widget import Widget
 from lernid.LernidOptions import Options
 from lernid.lernidconfig import get_data_path
+from urlparse import urlparse
 
 class Browser(Widget):
 
@@ -115,6 +116,8 @@
         return self._browser.get_property('uri')
 
     def set_location(self, url):
+        if urlparse(url).scheme == '':
+                url = 'http://' + url
         logging.debug('opening url: '+url)
         self._browser.open(url)
         self.emit('page-changed', url)