From b852381a3ae9a663e4c9e355e47d6847613bb6c1 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Dec 20 2017 17:42:31 +0000 Subject: remove simplejson imports Fixes: https://pagure.io/koji/issue/727 --- diff --git a/builder/kojid b/builder/kojid index a68353f..f1e20f3 100755 --- a/builder/kojid +++ b/builder/kojid @@ -30,10 +30,7 @@ import koji.plugin import koji.util import koji.tasks import glob -try: - import json -except ImportError: # pragma: no cover - import simplejson as json +import json import logging import logging.handlers from koji.daemon import incremental_upload, log_output, TaskManager, SCM diff --git a/docs/source/writing_koji_code.rst b/docs/source/writing_koji_code.rst index ee00c59..f3e4ed6 100644 --- a/docs/source/writing_koji_code.rst +++ b/docs/source/writing_koji_code.rst @@ -674,7 +674,6 @@ You will need to install the following packages to actually run the tests. * ``python-coverage`` * ``python-krbV`` * ``python-mock`` - * ``python-simplejson`` * ``python-psycopg2`` * ``python-requests`` * ``python-qpid-proton`` diff --git a/hub/kojihub.py b/hub/kojihub.py index 6e05d73..7e664af 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -41,6 +41,7 @@ from koji.util import sha1_constructor from koji.util import dslice from koji.util import multi_fnmatch from koji.util import safer_move +import json import os import re import rpm @@ -59,11 +60,6 @@ import zipfile import koji.xmlrpcplus from koji.context import context -try: - import json -except ImportError: # pragma: no cover - import simplejson as json - logger = logging.getLogger('koji.hub')