improve pypy workaround

arpruss · Jun 21, 2015 · 1fd0d1e · 1fd0d1e
1 parent 93a6a80
commit 1fd0d1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/python2-scripts/mcpipy/mcpi/connection.py b/python2-scripts/mcpipy/mcpi/connection.py
@@ -3,6 +3,7 @@
 import sys
 import atexit
 import os
+import platform
 from util import flatten_parameters_to_string
 
 """ @author: Aron Nieminen, Mojang AB"""
@@ -29,10 +30,13 @@ def __init__(self, address=None, port=None):
         self.socket.connect((address, port))
         self.readFile = self.socket.makefile("r")
         self.lastSent = ""
-        atexit.register(self.close)
+        if platform.system() == "Windows":
+            atexit.register(self.close)
 
     def __del__(self):
-        self.close()
+        if platform.system() == "Windows":
+            self.close()
+            atexit.unregister(self.close)
 
     def close(self):
         try:

diff --git a/python2-scripts/mcpipy/text.py b/python2-scripts/mcpipy/text.py
@@ -84,4 +84,4 @@ def angleToTextDirection(angle):
         del sys.argv[0]
         text = " ".join(sys.argv)
 
-    pos = drawText(mc, fonts.FONTS['tallfont'], pos, forward, minecraft.Vec3(0,1,0), text, foreground, background)
+    drawText(mc, fonts.FONTS['tallfont'], pos, forward, minecraft.Vec3(0,1,0), text, foreground, background)