From 6a0bd8c5ad7d01b611220f25e2a1228e4d420945 Mon Sep 17 00:00:00 2001
From: Surya Ghatty <ghatty@us.ibm.com>
Date: Wed, 2 Mar 2016 23:06:19 +0000
Subject: [PATCH] Remove unintended exposure of private attribute
GaneshaNASHelper has a class attribute confrx that is
currently coded up as a public variable. This was unintended.
Made the following changes to fix this:
1. The variable name was updated from confrx to _confrx
per pep8 guidelines for defining non-public variables and instances.
2. All references to this variable have been updated.
Depends-On: Id7d43dee256856062bd0dadad9c469c1500ee36e
Change-Id: Ie4fe96cd9cf9f0ea281c94f5c1378b255f60bada
Co-Authored-By: Andrea Ma <ayma@us.ibm.com>
Co-Authored-By: Andrei Ta <ata@us.ibm.com>
Co-Authored-By: Michael Rowden <mrrowden@us.ibm.com>
Closes-Bug: #1551497
---
manila/share/drivers/ganesha/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manila/share/drivers/ganesha/__init__.py b/manila/share/drivers/ganesha/__init__.py
index 0aaf04911f..67b2d1a94c 100644
--- a/manila/share/drivers/ganesha/__init__.py
+++ b/manila/share/drivers/ganesha/__init__.py
@@ -58,7 +58,7 @@ class GaneshaNASHelper(NASHelperBase):
super(GaneshaNASHelper, self).__init__(execute, config, **kwargs)
self.tag = tag
- confrx = re.compile('\.(conf|json)\Z')
+ _confrx = re.compile('\.(conf|json)\Z')
def _load_conf_dir(self, dirpath, must_exist=True):
"""Load Ganesha config files in dirpath in alphabetic order."""
@@ -69,7 +69,7 @@ class GaneshaNASHelper(NASHelperBase):
raise
dirlist = []
LOG.info(_LI('Loading Ganesha config from %s.'), dirpath)
- conf_files = list(filter(self.confrx.search, dirlist))
+ conf_files = list(filter(self._confrx.search, dirlist))
conf_files.sort()
export_template = {}
for conf_file in conf_files: