diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-28 11:49:39 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-28 11:49:39 -0700 |
| commit | 5ff65f3804f7e7e19c29365ff73d645f241bd95a (patch) | |
| tree | e4d30f8b89d6c5a4710cdf89f789380fca08f202 | |
| parent | 229dbd0aab5f2ef6819773f79eb17cdc8f27773a (diff) | |
| parent | ad3a7b184553afa88d6bfe52dfadcf8c577319e5 (diff) | |
Merge remote-tracking branch 'pinkavaj/fix-modtool-00' into next
| -rw-r--r-- | gr-utils/python/modtool/modtool_add.py | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/templates.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-utils/python/modtool/modtool_add.py b/gr-utils/python/modtool/modtool_add.py index d560c0878c..416c0943b7 100644 --- a/gr-utils/python/modtool/modtool_add.py +++ b/gr-utils/python/modtool/modtool_add.py @@ -143,7 +143,7 @@ class ModToolAdd(ModTool): elif self._info['is_component']: return Templates['grlicense'] else: - return get_template('defaultlicense', **self._info) + return Templates['defaultlicense'].format(**self._info) def _write_tpl(self, tpl, path, fname): """ Shorthand for writing a substituted template to a file""" diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 07534e5673..a9c117ac91 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -42,7 +42,7 @@ You should have received a copy of the GNU General Public License along with this software; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA. -'''.format(datetime.now().year) +''' % datetime.now().year Templates['grlicense'] = ''' Copyright {0} Free Software Foundation, Inc. |