using Popen as backup when ST2 doesn't have SSL support

This commit is contained in:
Alan Hamlett 2013-08-12 20:30:06 -07:00
parent 8d39fccabb
commit 6e0b332885

View File

@ -30,18 +30,19 @@ SETTINGS = {}
LAST_ACTION = 0 LAST_ACTION = 0
LAST_FILE = None LAST_FILE = None
BUSY = False BUSY = False
HAS_SSL = False
# check if we have SSL support # check if we have SSL support
try: try:
import ssl import ssl
HAS_SSL = True HAS_SSL = True
except ImportError:
#from subprocess import Popen
pass
# import wakatime package # import wakatime package
sys.path.insert(0, join(PLUGIN_DIR, 'packages', 'wakatime')) sys.path.insert(0, join(PLUGIN_DIR, 'packages', 'wakatime'))
import wakatime import wakatime
except ImportError:
from subprocess import Popen
def setup_settings_file(): def setup_settings_file():
@ -155,15 +156,15 @@ class SendActionThread(threading.Thread):
if SETTINGS.get('debug'): if SETTINGS.get('debug'):
cmd.append('--verbose') cmd.append('--verbose')
print(cmd) print(cmd)
#if HAS_SSL: if HAS_SSL:
wakatime.main(cmd) wakatime.main(cmd)
"""else: else:
cmd.insert(0, python_binary()) cmd.insert(0, python_binary())
if platform.system() == 'Windows': if platform.system() == 'Windows':
Popen(cmd, shell=False) Popen(cmd, shell=False)
else: else:
with open(join(expanduser('~'), '.wakatime.log'), 'a') as stderr: with open(join(expanduser('~'), '.wakatime.log'), 'a') as stderr:
Popen(cmd, stderr=stderr)""" Popen(cmd, stderr=stderr)
def plugin_loaded(): def plugin_loaded():