From 2baeaa5752ba62fe5dbdf431eeadb8b86b6f95be Mon Sep 17 00:00:00 2001 From: Quantum Date: Wed, 22 Aug 2018 17:42:34 -0400 Subject: [PATCH] Fix python 2 on linux. --- punyverse/_model.pyx | 2 +- punyverse/game.py | 2 +- punyverse/model.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/punyverse/_model.pyx b/punyverse/_model.pyx index 7bf026e..528f8cf 100644 --- a/punyverse/_model.pyx +++ b/punyverse/_model.pyx @@ -272,7 +272,7 @@ def load_model(path): if not os.path.isabs(path): path = os.path.join(model_base, path) if not isinstance(path, unicode): - path = path.decode('mbcs') + path = path.decode('mbcs' if os.name == 'nt' else 'utf8') return WavefrontObject(path) @cython.nonecheck(False) diff --git a/punyverse/game.py b/punyverse/game.py index 58febbc..417e412 100644 --- a/punyverse/game.py +++ b/punyverse/game.py @@ -247,7 +247,7 @@ class Applet(pyglet.window.Window): with os.fdopen(fd, 'wb') as file: image.save(file, 'BMP') if isinstance(filename, six.binary_type): - filename = filename.decode('mbcs') + filename = filename.decode('mbcs' if os.name == 'nt' else 'utf8') image = windll.user32.LoadImageW(None, filename, 0, 0, 0, 0x10) windll.user32.OpenClipboard(self._hwnd) windll.user32.EmptyClipboard() diff --git a/punyverse/model.py b/punyverse/model.py index 010ec92..3275c41 100644 --- a/punyverse/model.py +++ b/punyverse/model.py @@ -241,7 +241,7 @@ def load_model(path): if not os.path.isabs(path): path = os.path.join(model_base, path) if isinstance(path, six.binary_type): - path = path.decode('mbcs') + path = path.decode('mbcs' if os.name == 'nt' else 'utf8') return WavefrontObject(path)