rattail/rattail
2
0
Fork 0
Code Issues 7 Pull requests Actions Packages Projects Releases Wiki Activity

Tweak some label printing logic to support python 3

Browse source
This commit is contained in:
Lance Edgar 2019-01-21 16:23:24 -06:00
parent c6329cded6
commit 81a2dfa1f4
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rattail/labels.py
View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2018 Lance Edgar
# Copyright © 2010-2019 Lance Edgar
#
# This file is part of Rattail.
#
@ -30,7 +30,8 @@ import os
import os.path
import socket
import shutil
from six import StringIO
import six
from rattail.core import Object
from rattail.files import temp_path
@ -174,7 +175,7 @@ class CommandNetworkPrinter(CommandPrinter):
if not self.port:
raise LabelPrintingError("Printer does not have a port defined.")
data = StringIO()
data = six.StringIO()
header = self.batch_header_commands()
if header:
@ -240,7 +241,7 @@ class CommandFormatter(LabelFormatter):
"""
def format_labels(self, labels, progress=None):
fmt = StringIO()
fmt = six.StringIO()
def format_label(record, i):
product, quantity, data = record
@ -250,7 +251,10 @@ class CommandFormatter(LabelFormatter):
header = "{0}\n".format('\n'.join(header))
fmt.write(header.encode('utf_8'))
body = "{}\n".format('\n'.join(self.label_body_commands(product, **data)))
fmt.write(body.encode('utf_8'))
if six.PY3:
fmt.write(body)
else: # PY2
fmt.write(body.encode('utf_8'))
footer = self.label_footer_commands()
if footer:
footer = "{0}\n".format('\n'.join(footer))
@ -259,7 +263,10 @@ class CommandFormatter(LabelFormatter):
progress_loop(format_label, labels, progress,
message="Formatting labels")
val = fmt.getvalue().decode('utf_8')
if six.PY3:
val = fmt.getvalue()
else: # PY2
val = fmt.getvalue().decode('utf_8')
fmt.close()
return val
@ -304,7 +311,7 @@ class TwoUpCommandFormatter(CommandFormatter):
raise NotImplementedError
def format_labels(self, labels, progress=None):
fmt = StringIO()
fmt = six.StringIO()
self.half_started = False
def format_label(record, i):