From 59f22bd1138d6325a90f9eab4896381fa85f7c98 Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin Date: Sat, 9 Sep 2017 20:22:10 +0300 Subject: [PATCH] module: alternate naming for some properties --- pygnulib/generator.py | 2 +- pygnulib/module.py | 64 +++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pygnulib/generator.py b/pygnulib/generator.py index e8c6a23101..b99cd1fbf7 100644 --- a/pygnulib/generator.py +++ b/pygnulib/generator.py @@ -222,7 +222,7 @@ class AutoconfSnippet(Generator): def __iter__(self): module = self.__module if module.name not in ("gnumakefile", "maintainer-makefile") or self.toplevel: - snippet = module.configure_ac_snippet + snippet = module.autoconf_snippet include_guard_prefix = self.__config.include_guard_prefix snippet.replace(r"${gl_include_guard_prefix}", include_guard_prefix) if not self.libtool: diff --git a/pygnulib/module.py b/pygnulib/module.py index 75aad88a96..88d4fc3995 100644 --- a/pygnulib/module.py +++ b/pygnulib/module.py @@ -14,20 +14,20 @@ import re class Module: """gnulib generic module""" _TABLE_ = { - "description" : (0x00, str, "Description"), - "comment" : (0x01, str, "Comment"), - "status" : (0x02, str, "Status"), - "notice" : (0x03, str, "Notice"), - "applicability" : (0x04, str, "Applicability"), - "files" : (0x05, list, "Files"), - "dependencies" : (0x06, list, "Depends-on"), - "early_configure_ac_snippet" : (0x07, str, "configure.ac-early"), - "configure_ac_snippet" : (0x08, str, "configure.ac"), - "makefile_am_snippet" : (0x09, str, "Makefile.am"), - "include" : (0x0A, list, "Include"), - "link" : (0x0B, list, "Link"), - "license" : (0x0C, str, "License"), - "maintainers" : (0x0D, list, "Maintainer"), + "description" : (0x00, str, "Description"), + "comment" : (0x01, str, "Comment"), + "status" : (0x02, str, "Status"), + "notice" : (0x03, str, "Notice"), + "applicability" : (0x04, str, "Applicability"), + "files" : (0x05, list, "Files"), + "dependencies" : (0x06, list, "Depends-on"), + "early_autoconf_snippet" : (0x07, str, "configure.ac-early"), + "autoconf_snippet" : (0x08, str, "configure.ac"), + "automake_snippet" : (0x09, str, "Makefile.am"), + "include" : (0x0A, list, "Include"), + "link" : (0x0B, list, "Link"), + "license" : (0x0C, str, "License"), + "maintainers" : (0x0D, list, "Maintainer"), } _PATTERN_DEPENDENCIES_ = re.compile("^(\\S+)(?:\\s+(.+))*$") _PATTERN_INCLUDE_ = re.compile("^[\\<\"]([A-Za-z0-9/\\-_]+\\.h)[\\>\"](?:\\s+.*^)*$") @@ -163,39 +163,39 @@ class Module: @property - def early_configure_ac_snippet(self): + def early_autoconf_snippet(self): """early configure.ac snippet""" - return self._table_["early_configure_ac_snippet"] + return self._table_["early_autoconf_snippet"] - @early_configure_ac_snippet.setter - def early_configure_ac_snippet(self, value): + @early_autoconf_snippet.setter + def early_autoconf_snippet(self, value): if not isinstance(value, str): raise TypeError("'str' type is expected") - self._table_["early_configure_ac_snippet"] = value + self._table_["early_autoconf_snippet"] = value @property - def configure_ac_snippet(self): + def autoconf_snippet(self): """configure.ac snippet""" - return self._table_["configure_ac_snippet"] + return self._table_["autoconf_snippet"] - @configure_ac_snippet.setter - def configure_ac_snippet(self, value): + @autoconf_snippet.setter + def autoconf_snippet(self, value): if not isinstance(value, str): raise TypeError("'str' type is expected") - self._table_["configure_ac_snippet"] = value + self._table_["autoconf_snippet"] = value @property - def makefile_am_snippet(self): + def automake_snippet(self): """Makefile.am snippet""" - return self._table_["makefile_am_snippet"] + return self._table_["automake_snippet"] - @makefile_am_snippet.setter - def makefile_am_snippet(self, value): + @automake_snippet.setter + def automake_snippet(self, value): if not isinstance(value, str): raise TypeError("'str' type is expected") - self._table_["makefile_am_snippet"] = value + self._table_["automake_snippet"] = value @property @@ -354,9 +354,9 @@ class FileModule(Module): "Applicability" : (str, "applicability"), "Files" : (list, "files"), "Depends-on" : (list, "dependencies"), - "configure.ac-early" : (str, "early_configure_ac_snippet"), - "configure.ac" : (str, "configure_ac_snippet"), - "Makefile.am" : (str, "makefile_am_snippet"), + "configure.ac-early" : (str, "early_autoconf_snippet"), + "configure.ac" : (str, "autoconf_snippet"), + "Makefile.am" : (str, "automake_snippet"), "Include" : (list, "include"), "Link" : (list, "link"), "License" : (str, "license"), -- 2.39.5