raise PackagingError, ("could not parse %s due to %s: %s"
% (what or repr(verstr), cls.__name__, value)), trace
+def get_openssl_version():
+ try:
+ from OpenSSL import SSL
+ return extract_openssl_version(SSL)
+ except Exception:
+ return ("unknown", None, None)
+
+def extract_openssl_version(ssl_module):
+ openssl_version = ssl_module.SSLeay_version(ssl_module.SSLEAY_VERSION)
+ if openssl_version.startswith('OpenSSL '):
+ openssl_version = openssl_version[8 :]
+
+ (version, _, comment) = openssl_version.partition(' ')
+
+ try:
+ openssl_cflags = ssl_module.SSLeay_version(ssl_module.SSLEAY_CFLAGS)
+ if '-DOPENSSL_NO_HEARTBEATS' in openssl_cflags.split(' '):
+ comment += ", no heartbeats"
+ except Exception:
+ pass
+
+ return (version, None, comment if comment else None)
def get_package_versions_and_locations():
import warnings
packages.append( (pkgname, (platform.python_version(), sys.executable, None)) )
elif pkgname == 'platform':
packages.append( (pkgname, (get_platform(), None, None)) )
+ elif pkgname == 'OpenSSL':
+ packages.append( (pkgname, get_openssl_version()) )
return packages
from _auto_deps import not_import_versionable, ignorable
errors = []
- not_pkg_resourceable = ['python', 'platform', __appname__.lower()]
+ not_pkg_resourceable = ['python', 'platform', __appname__.lower(), 'openssl']
for name, (imp_ver, imp_loc, imp_comment) in imported_vers_and_locs_list:
name = name.lower()
% (name, pr_ver, str(pr_normver), pr_loc, imp_ver, str(imp_normver), imp_loc))
imported_packages = set([p.lower() for (p, _) in imported_vers_and_locs_list])
+ extra_vers_and_locs_list = []
for pr_name, (pr_ver, pr_loc) in pkg_resources_vers_and_locs.iteritems():
if pr_name not in imported_packages and pr_name not in ignorable:
- errors.append("Warning: dependency %r (version %r) found by pkg_resources not found by import."
- % (pr_name, pr_ver))
+ extra_vers_and_locs_list.append( (pr_name, (pr_ver, pr_loc, "according to pkg_resources")) )
- return errors
+ return errors, extra_vers_and_locs_list
def get_error_string(errors, debug=False):
return dict([(k, l) for k, (v, l, c) in _vers_and_locs_list])
def get_package_versions_string(show_paths=False, debug=False):
+ errors = []
+ if not hasattr(sys, 'frozen'):
+ global _vers_and_locs_list
+ errors, extra_vers_and_locs_list = cross_check_pkg_resources_versus_import()
+ _vers_and_locs_list += extra_vers_and_locs_list
+
res = []
for p, (v, loc, comment) in _vers_and_locs_list:
info = str(p) + ": " + str(v)
output = "\n".join(res) + "\n"
- if not hasattr(sys, 'frozen'):
- errors = cross_check_pkg_resources_versus_import()
- if errors:
- output += get_error_string(errors, debug=debug)
+ if errors:
+ output += get_error_string(errors, debug=debug)
return output