mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-03 11:44:11 +00:00
Fix PyInstaller.
This commit is contained in:
parent
22227c7094
commit
f6d9c5a1b2
@ -11,7 +11,7 @@ import binascii
|
|||||||
from tempfile import TemporaryFile
|
from tempfile import TemporaryFile
|
||||||
from os import SEEK_END, SEEK_SET
|
from os import SEEK_END, SEEK_SET
|
||||||
import mmap
|
import mmap
|
||||||
from importlib.metadata import version as get_package_version
|
from importlib.metadata import version as get_package_version, PackageNotFoundError
|
||||||
|
|
||||||
from cryptography.x509 import Certificate as CryptoCertificate
|
from cryptography.x509 import Certificate as CryptoCertificate
|
||||||
from zope.interface import implementer
|
from zope.interface import implementer
|
||||||
@ -63,7 +63,15 @@ from allmydata.interfaces import BadWriteEnablerError
|
|||||||
# Until we figure out Nix (https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3963),
|
# Until we figure out Nix (https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3963),
|
||||||
# need to support old pycddl which can only take bytes:
|
# need to support old pycddl which can only take bytes:
|
||||||
from distutils.version import LooseVersion
|
from distutils.version import LooseVersion
|
||||||
PYCDDL_BYTES_ONLY = LooseVersion(get_package_version("pycddl")) < LooseVersion("0.4")
|
|
||||||
|
try:
|
||||||
|
PYCDDL_BYTES_ONLY = LooseVersion(get_package_version("pycddl")) < LooseVersion(
|
||||||
|
"0.4"
|
||||||
|
)
|
||||||
|
except PackageNotFoundError:
|
||||||
|
# This can happen when building PyInstaller distribution. We'll just assume
|
||||||
|
# you installed a modern pycddl, cause why wouldn't you?
|
||||||
|
PYCDDL_BYTES_ONLY = False
|
||||||
|
|
||||||
|
|
||||||
class ClientSecretsException(Exception):
|
class ClientSecretsException(Exception):
|
||||||
|
Loading…
Reference in New Issue
Block a user