manually merge pull requests #237

Merged
Atheros1 merged 2 commits from master into master 2013-06-20 22:42:52 +02:00
Showing only changes of commit a6c9ff288e - Show all commits

View File

@ -427,7 +427,7 @@ except:
lib_path = path.join(sys._MEIPASS, "libeay32.dll") lib_path = path.join(sys._MEIPASS, "libeay32.dll")
OpenSSL = _OpenSSL(lib_path) OpenSSL = _OpenSSL(lib_path)
except: except:
if 'linux' in sys.platform or 'darwin' in sys.platform: if 'linux' in sys.platform or 'darwin' in sys.platform or 'freebsd' in sys.platform:
try: try:
from ctypes.util import find_library from ctypes.util import find_library
OpenSSL = _OpenSSL(find_library('ssl')) OpenSSL = _OpenSSL(find_library('ssl'))