Francesco Romani has uploaded a new change for review. Change subject: jsonrpc: revert switch to the simplejson module ......................................................................
jsonrpc: revert switch to the simplejson module This reverts commit 58553451547fe70958c01585f58d50c8ed75493b. It is too late to have a new dependency in. Change-Id: I4d165b4698dd30de27bc46c7157585bd0477c70a Signed-off-by: Francesco Romani <from...@redhat.com> --- M debian/control M lib/yajsonrpc/__init__.py M vdsm.spec.in 3 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/35347/1 diff --git a/debian/control b/debian/control index 8a418db..3a1154a 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,6 @@ python-rpm, python-selinux, sudo (>= 1.7.3) - python-simplejson (>= 2.0.9) Standards-Version: 3.9.4 Homepage: http://www.ovirt.org/wiki/Vdsm Vcs-Git: git://gerrit.ovirt.org/vdsm @@ -36,7 +35,7 @@ Package: vdsm-yajsonrpc Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), python-simplejson (>= 2.0.9) +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), Description: JSON RPC server and client implementation A JSON RPC server and client implementation. diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py index e85cdc7..b3fd590 100644 --- a/lib/yajsonrpc/__init__.py +++ b/lib/yajsonrpc/__init__.py @@ -12,14 +12,12 @@ # You should have received a copy of the GNU General Public # License along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import json import logging from functools import partial from Queue import Queue from weakref import ref from threading import Lock, Event - -import simplejson as json - from vdsm.utils import traceback __all__ = ["tcpReactor"] diff --git a/vdsm.spec.in b/vdsm.spec.in index 0295413..8bfbe20 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -97,7 +97,6 @@ BuildRequires: openssl BuildRequires: policycoreutils-python BuildRequires: m2crypto -BuildRequires: python-simplejson >= 2.0.9 %if 0%{?rhel} == 6 BuildRequires: python-argparse BuildRequires: python-ordereddict @@ -317,7 +316,6 @@ BuildArch: noarch Requires: python >= 2.6 -Requires: python-simplejson >= 2.0.9 %description yajsonrpc A JSON RPC server and client implementation. -- To view, visit http://gerrit.ovirt.org/35347 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d165b4698dd30de27bc46c7157585bd0477c70a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Francesco Romani <from...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
