summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2010-09-02 01:30:32 +0900
committerINADA Naoki <songofacandy@gmail.com>2010-09-02 01:30:32 +0900
commita301c14faa69fe7fa1c18d635f6c6fe5fa5d8d19 (patch)
tree9ceb2d1833e58c8f9e8b750c6cfc87badb2c83e5
parent0dc8938dbfff67760834bd97150fee5fdb8e875c (diff)
parentf0e6d33f7965908988a8023ed734188d86f4f448 (diff)
downloadmsgpack-python-a301c14faa69fe7fa1c18d635f6c6fe5fa5d8d19.tar.gz
Merge branch 'master' of github.com:msgpack/msgpack
-rw-r--r--msgpack/__init__.py7
-rwxr-xr-xsetup.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/msgpack/__init__.py b/msgpack/__init__.py
index 9593714..86786a2 100644
--- a/msgpack/__init__.py
+++ b/msgpack/__init__.py
@@ -1,3 +1,10 @@
# coding: utf-8
from msgpack._msgpack import *
+# alias for compatibility to simplejson/marshal/pickle.
+load = unpack
+loads = unpackb
+
+dump = pack
+dumps = packb
+
diff --git a/setup.py b/setup.py
index 8d8a6f4..64e71ed 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ except ImportError:
from distutils.command.build_ext import build_ext
have_cython = False
-version = '0.1.3'
+version = '0.1.4'
# take care of extension modules.
if have_cython: