diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2016-05-07 11:33:21 +0530 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-10 09:47:06 +0200 |
| commit | 51db9380cfc862993e1909602d2726e851f463b4 (patch) | |
| tree | 7b7b2011e5904961b75d800c38d616ab0e308bd8 /ipapython | |
| parent | 8787e032281e0715a4f405a2ce4f2529cd73e9d7 (diff) | |
| download | freeipa-51db9380cfc862993e1909602d2726e851f463b4.tar.gz freeipa-51db9380cfc862993e1909602d2726e851f463b4.tar.xz freeipa-51db9380cfc862993e1909602d2726e851f463b4.zip | |
Removed custom implementation of CalledProcessError
Removed custom class of CalledProcessError which was required for
Python versions prior to 2.5
Fixes: https://fedorahosted.org/freeipa/ticket/5717
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/ipautil.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 4597f1c63..d4c8e8b82 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -1,6 +1,6 @@ # Authors: Simo Sorce <ssorce@redhat.com> # -# Copyright (C) 2007-2011 Red Hat +# Copyright (C) 2007-2016 Red Hat, Inc. # see file 'COPYING' for use and warranty information # # This program is free software; you can redistribute it and/or modify @@ -40,6 +40,7 @@ import grp from contextlib import contextmanager import locale import collections +from subprocess import CalledProcessError from dns import resolver, reversename from dns.exception import DNSException @@ -64,20 +65,6 @@ KRB5_KDC_UNREACH = 2529639068 # Cannot contact any KDC for requested realm KRB5KDC_ERR_SVC_UNAVAILABLE = 2529638941 # A service is not available that is # required to process the request -try: - from subprocess import CalledProcessError -except ImportError: - # Python 2.4 doesn't implement CalledProcessError - class CalledProcessError(Exception): - """This exception is raised when a process run by check_call() returns - a non-zero exit status. The exit status will be stored in the - returncode attribute.""" - def __init__(self, returncode, cmd, output=None): - self.returncode = returncode - self.cmd = cmd - self.output = output - def __str__(self): - return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) def get_domain_name(): try: |