summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2008-11-20 13:34:37 +0000
committerHubert Plociniczak <hubert@lshift.net>2008-11-20 13:34:37 +0000
commitefdd39fbdaa819c4a2fe8e7083978fd3c25b1565 (patch)
tree527dcc92c469ef773d1e8f96eaaa471011ff91d6
parent2ce725bcc9768065b44bf943968107c795a44c8f (diff)
downloadrabbitmq-server-bug19841.tar.gz
Moved from python-json to python-simplejson.bug19841
Fixed 'unicode' problem for auto-generated code.
-rw-r--r--codegen.py3
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec2
-rw-r--r--packaging/debs/Debian/debian/control2
3 files changed, 4 insertions, 3 deletions
diff --git a/codegen.py b/codegen.py
index 5dbc57c7..629f2b8c 100644
--- a/codegen.py
+++ b/codegen.py
@@ -58,7 +58,8 @@ erlangDefaultValueTypeConvMap = {
str : lambda x: "<<\"" + x + "\">>",
int : lambda x: str(x),
float : lambda x: str(x),
- dict: convertTable
+ dict: convertTable,
+ unicode: lambda x: "<<\"" + x.encode("utf-8") + "\">>"
}
def erlangize(s):
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index ae2f2d2b..14142dfc 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -11,7 +11,7 @@ URL: http://www.rabbitmq.com/
Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd.
%if 0%{?debian}
%else
-BuildRequires: erlang, python-json
+BuildRequires: erlang, python-simplejson
%endif
Requires: erlang, logrotate
Packager: Hubert Plociniczak <hubert@lshift.net>
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 749791a4..31a48cff 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -2,7 +2,7 @@ Source: rabbitmq-server
Section: net
Priority: extra
Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com>
-Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-json
+Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson
Standards-Version: 3.7.2
Package: rabbitmq-server