diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-03-31 10:57:06 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2017-03-31 11:03:47 -0600 |
| commit | 34fe01c204711f0ef02a43a9aba1bf5141465af9 (patch) | |
| tree | 7022994a9aaca482e8621bd06d4d388b5c40cf89 /base/server/python/pki/server | |
| parent | ed5886687164a5aea00602303fbc0581602da86f (diff) | |
| download | pki-34fe01c204711f0ef02a43a9aba1bf5141465af9.tar.gz pki-34fe01c204711f0ef02a43a9aba1bf5141465af9.tar.xz pki-34fe01c204711f0ef02a43a9aba1bf5141465af9.zip | |
Fix for pylint when using Python 3.6
Added 'pylint: disable=no-member' whenever module 're'
attempts to reference its 'MULTILINE' member.
Diffstat (limited to 'base/server/python/pki/server')
| -rw-r--r-- | base/server/python/pki/server/__init__.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 6 |
2 files changed, 10 insertions, 2 deletions
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/<major version>.<minor version>" - 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( |