From c8b2b5ff8725bb9e63f7582da2922934f3c0392b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 3 Jun 2012 21:44:04 +0900 Subject: [PATCH] look for certs in bundled location --- anki/sync.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/anki/sync.py b/anki/sync.py index a2a6c7ee6..0251993a4 100644 --- a/anki/sync.py +++ b/anki/sync.py @@ -13,7 +13,6 @@ from anki.lang import _ from hooks import runHook # syncing vars -HTTP_CERTS = os.path.join(os.path.dirname(__file__), "ankiweb.certs") HTTP_TIMEOUT = 30 HTTP_PROXY = None @@ -21,8 +20,20 @@ HTTP_PROXY = None ###################################################################### def httpCon(): + certs = os.path.join(os.path.dirname(__file__), "ankiweb.certs") + if not os.path.exists(certs): + if isWin: + certs = os.path.join( + os.path.dirname(os.path.abspath(sys.argv[0])), + "ankiweb.certs") + elif isMac: + certs = os.path.join( + os.path.dirname(os.path.abspath(sys.argv[0])), + "../Resources/ankiweb.certs") + else: + assert 0 return httplib2.Http( - timeout=HTTP_TIMEOUT, ca_certs=HTTP_CERTS, + timeout=HTTP_TIMEOUT, ca_certs=certs, proxy_info=HTTP_PROXY) # Proxy handling