diff --git a/doc/source/_exts/members.py b/doc/source/_exts/members.py index c6b134871..238bbbfbe 100644 --- a/doc/source/_exts/members.py +++ b/doc/source/_exts/members.py @@ -43,7 +43,6 @@ class MembersTable(tables.Table): def run(self): env = self.state.document.settings.env - app = env.app # The required argument to the directive is the name of the # file to parse. @@ -73,7 +72,7 @@ class MembersTable(tables.Table): rel_filename, filename = env.relfn2path(datafile) # Build the table node using the parsed file - data_iter = members.parse_members_file(app, filename) + data_iter = members.parse_members_file(filename) table_node = self.build_table( data_iter, col_widths, diff --git a/openstack_governance/members.py b/openstack_governance/members.py index c1aa66430..072ef70bd 100644 --- a/openstack_governance/members.py +++ b/openstack_governance/members.py @@ -10,13 +10,16 @@ # License for the specific language governing permissions and limitations # under the License. +import logging import re +LOG = logging.getLogger(__name__) + # Full name (IRC) [expires in] {role} _PATTERN = re.compile('(?P.*)\s+\((?P.*)\)\s+\<(?P.*)\>\s+\[(?P.*)\](\s+\{(?P.*)\})?') -def parse_members_file(app, filename): +def parse_members_file(filename): """Load the members file and return each row as a dictionary. """ with open(filename, 'r') as f: @@ -26,7 +29,7 @@ def parse_members_file(app, filename): continue m = _PATTERN.match(line) if not m: - app.warning('Could not parse line %d of %s: %r' % + LOG.warning('Could not parse line %d of %s: %r' % (linum, filename, line)) continue yield m.groupdict()