From cbabeebc95e9e42c0356e089b742588a4de75d56 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Tue, 29 Jan 2013 14:47:16 +0900 Subject: [PATCH] Use MSGPACK_PUREPYTHON envvar to test fallback module --- .travis.yml | 2 +- msgpack/__init__.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e6fc56..e536fdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ install: - cython --cplus msgpack/_packer.pyx - cython --cplus msgpack/_unpacker.pyx -script: "tox" +script: "tox && MSGPACK_PUREPYTHON=x tox" diff --git a/msgpack/__init__.py b/msgpack/__init__.py index 49a32d9..77f6b81 100644 --- a/msgpack/__init__.py +++ b/msgpack/__init__.py @@ -2,11 +2,15 @@ from msgpack._version import version from msgpack.exceptions import * -try: - from msgpack._packer import pack, packb, Packer - from msgpack._unpacker import unpack, unpackb, Unpacker -except ImportError: +import os +if os.environ.get('MSGPACK_PUREPYTHON'): from msgpack.fallback import pack, packb, Packer, unpack, unpackb, Unpacker +else: + try: + from msgpack._packer import pack, packb, Packer + from msgpack._unpacker import unpack, unpackb, Unpacker + except ImportError: + from msgpack.fallback import pack, packb, Packer, unpack, unpackb, Unpacker # alias for compatibility to simplejson/marshal/pickle. load = unpack