From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 17 Sep 2013 08:13:03 +0000 (+0000)
Subject: Byte type comparisons on the output queue
X-Git-Tag: 0.0.1~262
X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=commitdiff_plain;h=e27b1c4b71ab9cad6b2e41d7ff2cf41c3d8b8d3e

Byte type comparisons on the output queue

* lib/mudpy/misc.py: When comparing against data already in the output
queue, use byte type for compatibility with Py3K.
---

diff --git a/lib/mudpy/misc.py b/lib/mudpy/misc.py
index 2fe8e6f..b39610b 100644
--- a/lib/mudpy/misc.py
+++ b/lib/mudpy/misc.py
@@ -800,12 +800,12 @@ class User:
             # and the ansi escape to return to normal text
             if not just_prompt and prepend_padding:
                 if not self.output_queue \
-                   or not self.output_queue[-1].endswith("\r\n"):
+                   or not self.output_queue[-1].endswith(b"\r\n"):
                     output = "$(eol)" + output
                 elif not self.output_queue[-1].endswith(
-                    "\r\n\x1b[0m\r\n"
+                    b"\r\n\x1b[0m\r\n"
                 ) and not self.output_queue[-1].endswith(
-                    "\r\n\r\n"
+                    b"\r\n\r\n"
                 ):
                     output = "$(eol)" + output
             output += eol + chr(27) + "[0m"