IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Python 3 pylint errors

Browse Source 
************* Module ipaserver.install.ipa_kra_install
ipaserver/install/ipa_kra_install.py:25: [W0402(deprecated-module), ] Uses of a deprecated module 'optparse')
************* Module ipapython.install.core
ipapython/install/core.py:163: [E1101(no-member), _knob] Module 'types' has no 'TypeType' member)
************* Module ipatests.test_ipapython.test_dn
ipatests/test_ipapython/test_dn.py:1205: [W1505(deprecated-method), TestDN.test_x500_text] Using deprecated method assertEquals())
************* Module ipa-ca-install
install/tools/ipa-ca-install:228: [E1101(no-member), install_master] Instance of 'ValueError' has no 'message' member)
install/tools/ipa-ca-install:232: [E1101(no-member), install_master] Instance of 'ValueError' has no 'message' member)

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Simo Sorce <ssorce@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Christian Heimes 2017-03-15 08:47:46 +01:00 committed by Martin Basti
parent 474e6a7a71
commit 602b395cf1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/tools/ipa-ca-install
View File

@ -225,11 +225,11 @@ def install_master(safe_options, options):
try: try:
ca.subject_validator(ca.VALID_SUBJECT_BASE_ATTRS, options.subject_base) ca.subject_validator(ca.VALID_SUBJECT_BASE_ATTRS, options.subject_base)
except ValueError as e: except ValueError as e:
sys.exit("Subject base: {}".format(e.message)) sys.exit("Subject base: {}".format(e))
try: try:
ca.subject_validator(ca.VALID_SUBJECT_ATTRS, options.ca_subject) ca.subject_validator(ca.VALID_SUBJECT_ATTRS, options.ca_subject)
except ValueError as e: except ValueError as e:
sys.exit("CA subject: {}".format(e.message)) sys.exit("CA subject: {}".format(e))
ca.install_check(True, None, options) ca.install_check(True, None, options)
ca.install(True, None, options) ca.install(True, None, options)

4
ipapython/install/core.py
View File

@ -11,7 +11,6 @@ import collections
import functools import functools
import itertools import itertools
import sys import sys
import types
import six import six
@ -24,6 +23,7 @@ __all__ = ['InvalidStateError', 'KnobValueError', 'Property', 'knob',
'Configurable', 'group', 'Component', 'Composite'] 'Configurable', 'group', 'Component', 'Composite']
NoneType = type(None) NoneType = type(None)
builtin_type = type
# Configurable states # Configurable states
_VALIDATE_PENDING = 'VALIDATE_PENDING' _VALIDATE_PENDING = 'VALIDATE_PENDING'
@ -160,7 +160,7 @@ def _knob(type=_missing, default=_missing, bases=_missing, _order=_missing,
if bases is _missing: if bases is _missing:
bases = (KnobBase,) bases = (KnobBase,)
elif isinstance(bases, types.TypeType): elif isinstance(bases, builtin_type):
bases = (bases,) bases = (bases,)
if cli_names is None or isinstance(cli_names, str): if cli_names is None or isinstance(cli_names, str):

2
ipaserver/install/ipa_kra_install.py
View File

@ -22,7 +22,7 @@ from __future__ import print_function
import sys import sys
import tempfile import tempfile
from optparse import SUPPRESS_HELP from optparse import SUPPRESS_HELP # pylint: disable=deprecated-module
from textwrap import dedent from textwrap import dedent
from ipalib import api from ipalib import api

2
ipatests/test_ipapython/test_dn.py
View File

@ -1202,7 +1202,7 @@ class TestDN(unittest.TestCase):
longdn_rev = DN(longdn_x500) longdn_rev = DN(longdn_x500)
l = len(self.base_container_dn) l = len(self.base_container_dn)
for i in range(l): for i in range(l):
self.assertEquals(longdn_rev[i], self.base_container_dn[l-1-i]) self.assertEqual(longdn_rev[i], self.base_container_dn[l-1-i])
class TestEscapes(unittest.TestCase): class TestEscapes(unittest.TestCase):