removed pickle load
This commit is contained in:
parent
2b1374681f
commit
5de3255b3c
@ -1,7 +1,6 @@
|
|||||||
import re
|
import re
|
||||||
from os import environ, path
|
from os import environ, path
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
import pickle
|
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
|
|
||||||
@ -27,26 +26,9 @@ capabilities_path = environ.get(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Load external printer database
|
# Load external printer database
|
||||||
t0 = time.time()
|
|
||||||
logger.debug("Using capabilities from file: %s", capabilities_path)
|
|
||||||
if path.exists(pickle_path):
|
|
||||||
if path.getmtime(capabilities_path) > path.getmtime(pickle_path):
|
|
||||||
logger.debug("Found a more recent capabilities file")
|
|
||||||
full_load = True
|
|
||||||
else:
|
|
||||||
full_load = False
|
|
||||||
logger.debug("Loading capabilities from pickle in %s", pickle_path)
|
|
||||||
with open(pickle_path, "rb") as cf:
|
|
||||||
CAPABILITIES = pickle.load(cf)
|
|
||||||
else:
|
|
||||||
logger.debug("Capabilities pickle file not found: %s", pickle_path)
|
|
||||||
full_load = True
|
|
||||||
|
|
||||||
if full_load:
|
|
||||||
logger.debug("Loading and pickling capabilities")
|
logger.debug("Loading and pickling capabilities")
|
||||||
with open(capabilities_path) as cp, open(pickle_path, "wb") as pp:
|
with open(capabilities_path) as cp, open(pickle_path, "wb") as pp:
|
||||||
CAPABILITIES = yaml.safe_load(cp)
|
CAPABILITIES = yaml.safe_load(cp)
|
||||||
pickle.dump(CAPABILITIES, pp, protocol=2)
|
|
||||||
|
|
||||||
logger.debug("Finished loading capabilities took %.2fs", time.time() - t0)
|
logger.debug("Finished loading capabilities took %.2fs", time.time() - t0)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user