python3 compatibility

arpruss · Jul 7, 2016 · 944ac57 · 944ac57
1 parent 67ce5b1
commit 944ac57
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/python2-scripts.zip b/python2-scripts.zip
diff --git a/python2-scripts/mcpipy/text.py b/python2-scripts/mcpipy/text.py
@@ -27,17 +27,15 @@ def drawGlyph(mc, pos, forwardVec, upVec, glyph, foreground, background=None):
 
 def drawText(mc, font, pos, forwardVec, upVec, text, foreground, background=None):
     try:
-        text = text.decode("cp1252")
+        text = bytearray(text.encode("cp1252"))
     except:
-        text = text.decode("iso8859_1")
+        text = bytearray(text.encode("iso8859_1"))
     pixelPos = pos.clone()
     height = len(font[32][3])
-    numLines = text.count("\n")+1
+    numLines = text.count(b'\n')+1
     pixelPos += upVec * ((numLines-1) * height)
     lineStart = pixelPos.clone()
-    for c in text:
-        value = ord(c)
-
+    for value in text:
         if value == 10:
             lineStart += upVec * (-height)
             pixelPos = lineStart.clone()

diff --git a/python3-scripts.zip b/python3-scripts.zip
diff --git a/python3-scripts/mcpipy/text.py b/python3-scripts/mcpipy/text.py
@@ -27,17 +27,15 @@ def drawGlyph(mc, pos, forwardVec, upVec, glyph, foreground, background=None):
 
 def drawText(mc, font, pos, forwardVec, upVec, text, foreground, background=None):
     try:
-        text = text.decode("cp1252")
+        text = bytearray(text.encode("cp1252"))
     except:
-        text = text.decode("iso8859_1")
+        text = bytearray(text.encode("iso8859_1"))
     pixelPos = pos.clone()
     height = len(font[32][3])
-    numLines = text.count("\n")+1
+    numLines = text.count(b'\n')+1
     pixelPos += upVec * ((numLines-1) * height)
     lineStart = pixelPos.clone()
-    for c in text:
-        value = ord(c)
-
+    for value in text:
         if value == 10:
             lineStart += upVec * (-height)
             pixelPos = lineStart.clone()