Skip to content

Commit f9f41d3

Browse files
committed
Fix bytes vs str formatting for py33 and py34.
1 parent b8a5507 commit f9f41d3

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

simplefix/message.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -512,21 +512,21 @@ def encode(self, raw=False):
512512
if raw:
513513
# Walk pairs, creating string.
514514
for tag, value in self.pairs:
515-
buf += b"%s=%s%s" % (tag, value, SOH_STR)
515+
buf += tag + b'=' + value + SOH_STR
516516

517517
return buf
518518

519519
# Cooked.
520520
for tag, value in self.pairs:
521521
if int(tag) in (8, 9, 35, 10):
522522
continue
523-
buf += b"%s=%s%s" % (tag, value, SOH_STR)
523+
buf += tag + b'=' + value + SOH_STR
524524

525525
# Prepend the message type.
526526
if self.message_type is None:
527527
raise ValueError("No message type set")
528528

529-
buf = b"35=%s" % self.message_type + SOH_STR + buf
529+
buf = b"35=" + self.message_type + SOH_STR + buf
530530

531531
# Calculate body length.
532532
#
@@ -538,15 +538,15 @@ def encode(self, raw=False):
538538
if not self.begin_string:
539539
raise ValueError("No begin string set")
540540

541-
buf = b"8=%s" % self.begin_string + SOH_STR + \
542-
b"9=%u" % body_length + SOH_STR + \
543-
buf
541+
buf = b"8=" + self.begin_string + SOH_STR + \
542+
b"9=" + fix_val("%u" % body_length) + SOH_STR + \
543+
buf
544544

545545
# Calculate and append the checksum.
546546
checksum = 0
547547
for c in buf:
548548
checksum += ord(c) if sys.version_info.major == 2 else c
549-
buf += b"10=%03u" % (checksum % 256,) + SOH_STR
549+
buf += b"10=" + fix_val("%03u" % (checksum % 256,)) + SOH_STR
550550

551551
return buf
552552

0 commit comments

Comments
 (0)