setop
/
python-escpos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use pkg_resources 

This change uses if no path for e capabilities-file is supplied a
temporary file created by pkg_resources, which should be more robust
than directly accessing the file. (This failed sometimes, for example
in zipped distributions or uncommon structures)
This commit is contained in:
Patrick Kanzler 2020-05-11 22:43:44 +02:00
parent cbe412cfdb
commit b9e3827867
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/requirements.txt
View File

@ -3,6 +3,7 @@ Pillow>=2.0
qrcode>=4.0 qrcode>=4.0
pyserial pyserial
sphinx-rtd-theme sphinx-rtd-theme
setuptools
setuptools-scm setuptools-scm
docutils>=0.12 docutils>=0.12
python-barcode>=0.11.0,<1 python-barcode>=0.11.0,<1

1
setup.cfg
View File

@ -40,6 +40,7 @@ install_requires =
qrcode>=4.0 qrcode>=4.0
pyserial pyserial
python-barcode>=0.9.1,<1 python-barcode>=0.9.1,<1
setuptools
six six
appdirs appdirs
PyYAML PyYAML

7
src/escpos/capabilities.py
View File

@ -1,5 +1,6 @@
import re import re
from os import environ, path from os import environ, path
import pkg_resources
import pickle import pickle
import logging import logging
import time import time
@ -15,9 +16,9 @@ logger = logging.getLogger(__name__)
pickle_dir = environ.get('ESCPOS_CAPABILITIES_PICKLE_DIR', gettempdir()) pickle_dir = environ.get('ESCPOS_CAPABILITIES_PICKLE_DIR', gettempdir())
pickle_path = path.join(pickle_dir, '{v}.capabilities.pickle'.format(v=platform.python_version())) pickle_path = path.join(pickle_dir, '{v}.capabilities.pickle'.format(v=platform.python_version()))
capabilities_path = environ.get( # get a temporary file from pkg_resources if no file is specified in env
'ESCPOS_CAPABILITIES_FILE', capabilities_path = environ.get('ESCPOS_CAPABILITIES_FILE',
path.join(path.dirname(__file__), 'capabilities.json')) pkg_resources.resource_filename(__name__, 'capabilities.json'))
# Load external printer database # Load external printer database
t0 = time.time() t0 = time.time()