summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2011-05-31 15:40:11 +0900
committerINADA Naoki <songofacandy@gmail.com>2011-05-31 15:40:11 +0900
commit3ffc75928bfe5b5cf232de996a01436cb4064f65 (patch)
treecd78fa1dd0fdfad323a68486ef9671846a57b9ec
parent36b0c2de411701699faadf6d7f355b95044e581c (diff)
downloadmsgpack-python-3ffc75928bfe5b5cf232de996a01436cb4064f65.tar.gz
Revert "(python) Change error message for unicode is passed but no encoding is"
This reverts commit bd73742552cf16592662a7ec5ba3608888081131.
-rw-r--r--ChangeLog.rst10
-rw-r--r--msgpack/_msgpack.pyx2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 75e86b2..a0aae25 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,3 +1,13 @@
+0.1.10
+======
+:release date: NOT RELEASED YET
+
+New feature
+-----------
+* Add ``encoding`` and ``unicode_erros`` option to packer and unpacker.
+ When this option is specified, (un)packs unicode object instead of bytes.
+ This enables using msgpack as a replacement of json.
+
0.1.9
======
:release date: 2011-01-29
diff --git a/msgpack/_msgpack.pyx b/msgpack/_msgpack.pyx
index 14bc9d7..443cbd7 100644
--- a/msgpack/_msgpack.pyx
+++ b/msgpack/_msgpack.pyx
@@ -120,7 +120,7 @@ cdef class Packer(object):
ret = msgpack_pack_raw_body(&self.pk, rawval, len(o))
elif PyUnicode_Check(o):
if not self.encoding:
- raise TypeError("Can't pack unicode object: No encoding is specified")
+ raise TypeError("Can't encode utf-8 no encoding is specified")
o = PyUnicode_AsEncodedString(o, self.encoding, self.unicode_errors)
rawval = o
ret = msgpack_pack_raw(&self.pk, len(o))