From e51ab08e522d71d595f233bc29d737213206edf8 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Jul 10 2017 09:26:00 +0000 Subject: Remove kitchen Since Python 2.6 is the minimal version which rpkg works with, it is unnecessary to try importing subprocess from python-kitchen. Signed-off-by: Chenxiong Qi --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index 0d6918b..d6a9d2a 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -26,6 +26,7 @@ import six import sys import tempfile import koji.ssl.SSLCommon +import subprocess from six.moves import configparser from six.moves import urllib @@ -37,12 +38,6 @@ from pyrpkg.lookaside import CGILookasideCache from pyrpkg.sources import SourcesFile from pyrpkg.utils import cached_property, log_result -if sys.version_info[0:2] >= (2, 5): - import subprocess -else: - # We need a subprocess that has check_call - from kitchen.pycompat27 import subprocess - class NullHandler(logging.Handler): """Null logger to avoid spurious messages, add a handler in app code"""