Only use one getkw.py (#161)

* Only use one getkw.py

* Update PR template

* Appease MinazoBot

Author: robertodr

.gitattributes

@@ -71,12 +71,10 @@ tests/numerical_quadrature/*.cpp licensefile=.githooks/LICENSE-C++
 tests/utils/*.cpp                licensefile=.githooks/LICENSE-C++
 
 # tools
-doc/conf.py               licensefile=.githooks/LICENSE-Python
-doc/gfx/cloc_tools.py.in  licensefile=.githooks/LICENSE-Python
-src/make_cmake_files.py   licensefile=.githooks/LICENSE-Python
-tools/codata.py           licensefile=.githooks/LICENSE-Python
-tools/plot_cavity.py      licensefile=.githooks/LICENSE-Python
-tools/init.py             licensefile=.githooks/LICENSE-Python
-tests/make_cmake_files.py licensefile=.githooks/LICENSE-Python
-tests/go_pcm.py           licensefile=.githooks/LICENSE-Python
-tests/pcmparser.py        licensefile=.githooks/LICENSE-Python
+doc/conf.py                    licensefile=.githooks/LICENSE-Python
+doc/cloc_tools/cloc_wrapper.py licensefile=.githooks/LICENSE-Python
+tools/plot_cavity.py           licensefile=.githooks/LICENSE-Python
+tools/init.py                  licensefile=.githooks/LICENSE-Python
+tools/go_pcm.py.in             licensefile=.githooks/LICENSE-Python
+tools/pcmparser.py             licensefile=.githooks/LICENSE-Python
+tools/pcmdata.py               licensefile=.githooks/LICENSE-Python

.github/PULL_REQUEST_TEMPLATE.md

@@ -37,6 +37,5 @@
 
 ## Status
 <!--- Check this box when ready to be merged -->
-- [ ]  Ready to go
-
-
+- [ ] Ready to go
+- [ ] Cherry-pick to latest release branch

tools/CMakeLists.txt

@@ -13,14 +13,10 @@ install(
     ${CMAKE_INSTALL_BINDIR}
   )
 
-if(PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
-  configure_file(py3.x-getkw.py ${PROJECT_BINARY_DIR}/${PYMOD_INSTALL_FULLDIR}/getkw.py COPYONLY)
-else()
-  configure_file(py2.x-getkw.py ${PROJECT_BINARY_DIR}/${PYMOD_INSTALL_FULLDIR}/getkw.py COPYONLY)
-endif()
 configure_file(init.py ${PROJECT_BINARY_DIR}/${PYMOD_INSTALL_FULLDIR}/__init__.py COPYONLY)
 file(
   COPY
+    getkw.py
     pcmdata.py
     pcmparser.py
     pyparsing.py

tools/py3.x-getkw.py renamed to tools/getkw.py

@@ -238,6 +238,7 @@ def run_callbacks(self, templ):
             for tag in self.sect[i]:
                 self.sect[i][tag].run_callbacks(templ.sect[i][None])
 
+
 #verify!
 
     def sanity_check(self, path=None):
@@ -556,6 +557,8 @@ def __init__(self, templ=None):
             self.path = None
         if GetkwParser.bnf == None:
             GetkwParser.bnf = self.getkw_bnf()
+
+
 #        self.parseString=self.bnf.parseString
 #        GetkwParser.bnf.setDebug(True)
 
@@ -648,8 +651,8 @@ def store_vector(self, s, l, t):
                 if k.nargs == -1:
                     pass
                 elif len(arg) != k.nargs:
-                    print("Invalid number of elements for key '%s',\
-line: %d" % (name, lineno(self.loc, self.strg)))
+                    print("Invalid number of elements for key '{:s}', line: {:d}".format(
+                        name, lineno(self.loc, self.strg)))
                     print("  -> %d required, %d given." % (k.nargs, len(arg)))
                     if strict:
                         sys.exit(1)
@@ -779,6 +782,7 @@ def parse_error(s, t, d, err):
     print("Parse error, line %d: %s" % (lineno(err.loc, err.pstr), line(err.loc, err.pstr)))
     sys.exit(1)
 
+
 ######## Convenience routines for callbacks ########
 
 
@@ -814,6 +818,7 @@ def check_ignored(list, sect):
             else:
                 print(warn % (i, sect.name, '<' + sect.tag + '>'))
 
+
 ####################################################