From 34fe01c204711f0ef02a43a9aba1bf5141465af9 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 31 Mar 2017 10:57:06 -0600 Subject: Fix for pylint when using Python 3.6 Added 'pylint: disable=no-member' whenever module 're' attempts to reference its 'MULTILINE' member. --- base/server/python/pki/server/__init__.py | 6 +++++- base/server/python/pki/server/deployment/pkihelper.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 357bad3c3..503227470 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -858,7 +858,11 @@ class Tomcat(object): output = output.decode('utf-8') # find "Server version: Apache Tomcat/." - match = re.search(r'^Server version:[^/]*/(\d+).*$', output, re.MULTILINE) + match = re.search( + r'^Server version:[^/]*/(\d+).*$', + output, + re.MULTILINE # pylint: disable=no-member + ) if not match: raise Exception('Unable to determine Tomcat version') diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 2e276f522..051778d09 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -2721,7 +2721,11 @@ class Modutil: output = output.decode('utf-8') # find modules from lines such as '1. NSS Internal PKCS #11 Module' - modules = re.findall(r'^ +\d+\. +(.*)$', output, re.MULTILINE) + modules = re.findall( + r'^ +\d+\. +(.*)$', + output, + re.MULTILINE # pylint: disable=no-member + ) if modulename not in modules: config.pki_log.info( -- cgit