Merge pull request #859 from thopiekar/master-CURA-1831-newer

[CURA-1831] Adding only the basic workaround for OSX
This commit is contained in:
Jaime van Kessel 2016-07-11 09:22:08 +02:00 committed by GitHub
commit b48db45a37

View File

@ -9,6 +9,7 @@ from UM.Scene.SceneNode import SceneNode
from UM.Message import Message from UM.Message import Message
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
from UM.Platform import Platform
import collections import collections
import json import json
@ -18,6 +19,7 @@ import platform
import math import math
import urllib.request import urllib.request
import urllib.parse import urllib.parse
import ssl
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
@ -111,8 +113,13 @@ class SliceInfo(Extension):
binary_data = submitted_data.encode("utf-8") binary_data = submitted_data.encode("utf-8")
# Submit data # Submit data
kwoptions = {"data" : binary_data,
"timeout" : 1
}
if Platform.isOSX():
kwoptions["context"] = ssl._create_unverified_context()
try: try:
f = urllib.request.urlopen(self.info_url, data = binary_data, timeout = 1) f = urllib.request.urlopen(self.info_url, **kwoptions)
Logger.log("i", "Sent anonymous slice info to %s", self.info_url) Logger.log("i", "Sent anonymous slice info to %s", self.info_url)
f.close() f.close()
except Exception as e: except Exception as e: