From 056e961ccc8ba5f6e4deb2ac090b57bab0dae61e Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 25 Oct 2015 14:46:24 -0400 Subject: [PATCH] use webrowser module to open URIs (had some difficulty with LaunchDefaultBrowser on OS X) --- gui/mainFrame.py | 7 ++++--- service/pycrest/eve.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 5bc85793b..9432d4540 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -30,6 +30,7 @@ from wx.lib.wordwrap import wordwrap import service import config import threading +import webbrowser import gui.aboutData import gui.chromeTabs @@ -374,10 +375,10 @@ class MainFrame(wx.Frame): dlg.ShowModal() def goWiki(self, event): - wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/wiki') + webbrowser.open('https://github.com/DarkFenX/Pyfa/wiki') def goForums(self, event): - wx.LaunchDefaultBrowser('https://forums.eveonline.com/default.aspx?g=posts&t=247609') + webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=247609') def registerMenu(self): menuBar = self.GetMenuBar() @@ -506,7 +507,7 @@ class MainFrame(wx.Frame): self.showCharacterMgmt(type=0) else: uri = sCrest.startServer() - wx.LaunchDefaultBrowser(uri) + webbrowser.open(uri) else: dlg=CrestMgmt(self) dlg.Show() diff --git a/service/pycrest/eve.py b/service/pycrest/eve.py index 1c357f9a9..e56bfc927 100644 --- a/service/pycrest/eve.py +++ b/service/pycrest/eve.py @@ -216,7 +216,7 @@ class EVE(APIConnection): return "%s/authorize?response_type=%s&redirect_uri=%s&client_id=%s%s%s" % ( self._oauth_endpoint, grant_type, - quote(self.redirect_uri, safe=''), + self.redirect_uri, self.client_id, "&scope=%s" % ' '.join(s) if scopes else '', "&state=%s" % state if state else ''