Added hooke.plugin.license and removed get-warrenty info from short_license.

Also uncommented update_authors() and update_files() in
update_copyright, since I'm no longer testing the pyfile code ;).

diff --git a/hooke/plugin/__init__.py b/hooke/plugin/__init__.py
index 4249730e52ab9a3ecb0e88e455c8057991ea9d54..4ce90209e03f936c728ea047db83e4b96e15c472 100644 (file)
--- a/hooke/plugin/__init__.py
+++ b/hooke/plugin/__init__.py
@@ -58,6 +58,7 @@ BUILTIN_MODULES = [
     'config',
     'curve',
     'debug',
+    'license',
     'note',
     'playlist',
     'system',

diff --git a/hooke/plugin/license.py b/hooke/plugin/license.py
new file mode 100644 (file)
index 0000000..d405bf9
--- /dev/null
+++ b/hooke/plugin/license.py
@@ -0,0 +1,46 @@
+# Copyright (C) 2010 W. Trevor King <wking@drexel.edu>
+#
+# This file is part of Hooke.
+#
+# Hooke is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later version.
+#
+# Hooke is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with Hooke.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""The ``license`` module provides :class:`LicensePlugin` and
+associated :class:`hooke.command.Command`\s for displaying Hooke's
+licensing information.
+"""
+
+from .. import __license__
+from ..command import Command, Argument, Failure
+from ..plugin import Builtin
+
+
+class LicensePlugin (Builtin):
+    def __init__(self):
+        super(LicensePlugin, self).__init__(name='license')
+        self._commands = [LicenseCommand(self)]
+
+
+# Define commands
+
+class LicenseCommand (Command):
+    """Show licensing information.
+    """
+    def __init__(self, plugin):
+        super(LicenseCommand, self).__init__(
+            name='license',
+            help=self.__doc__, plugin=plugin)
+
+    def _run(self, hooke, inqueue, outqueue, params):
+       outqueue.put(__license__)

diff --git a/hooke/plugin/playlist.py b/hooke/plugin/playlist.py
index bcfb75635dfc1dc6bf1e64d6986f068d1280759b..62137d0159e40213e78af5a4a97c6b645ace4d65 100644 (file)
--- a/hooke/plugin/playlist.py
+++ b/hooke/plugin/playlist.py
@@ -21,8 +21,8 @@ several associated :class:`hooke.command.Command`\s for handling
 :mod:`hooke.playlist` classes.
 """
 
-import os.path
 import glob
+import os.path
 
 from ..command import Command, Argument, Failure
 from ..playlist import FilePlaylist

diff --git a/hooke/ui/commandline.py b/hooke/ui/commandline.py
index 197a80e9b6b1706ca68e81d9c0503d59adc69300..291f39558e9592f18492b985a21a985a91798764 100644 (file)
--- a/hooke/ui/commandline.py
+++ b/hooke/ui/commandline.py
@@ -412,7 +412,6 @@ class CommandLine (UserInterface):
     def run(self, commands, ui_to_command_queue, command_to_ui_queue):
         cmd = self._cmd(commands, ui_to_command_queue, command_to_ui_queue)
         cmd.cmdloop(self._splash_text(extra_info={
-                    'get-warrenty':'run `warrenty`',
                     'get-details':'run `license`',
                     }))
 

diff --git a/hooke/ui/gui/__init__.py b/hooke/ui/gui/__init__.py
index 329058431df7f4e4389540d9f76fc53acd43d0e4..574ca2951d510c9d745eb39631f4fca9fcecd708 100644 (file)
--- a/hooke/ui/gui/__init__.py
+++ b/hooke/ui/gui/__init__.py
@@ -243,8 +243,7 @@ class HookeFrame (wx.Frame):
         dialog = wx.MessageDialog(\r
             parent=self,\r
             message=self.gui._splash_text(extra_info={\r
-                    'get-warrenty':'click "help->warrenty"',\r
-                    'get-details':'click "help->license"',\r
+                    'get-details':'click "Help -> License"',\r
                     }),\r
             caption='About Hooke',\r
             style=wx.OK|wx.ICON_INFORMATION)\r

diff --git a/update_copyright.py b/update_copyright.py
index ef2799a7955ba994c5ec028d8745e76e1f2e8184..894b417e7e98ad17a04e31b1b014f089c685b207 100755 (executable)
--- a/update_copyright.py
+++ b/update_copyright.py
@@ -60,10 +60,9 @@ License along with %(project)s.  If not, see
 """.strip()
 
 SHORT_COPY_RIGHT_TEXT="""
-%(project)s comes with ABSOLUTELY NO WARRANTY; %(get-warrenty)s
-for details.  This is free software, and you are welcome to
-redistribute it under certain conditions; %(get-details)s
-for details.
+%(project)s comes with ABSOLUTELY NO WARRANTY and is licensed
+under the GNU Lesser General Public License.  For details,
+%(get-details)s
 """.strip()
 
 COPY_RIGHT_TAG='-xyz-COPY' + '-RIGHT-zyx-' # unlikely to occur in the wild :p
@@ -511,17 +510,14 @@ def _copyright_string(original_year, final_year, authors, prefix='',
     ...                         prefix='',
     ...                         text=SHORT_COPY_RIGHT_TEXT,
     ...                         author_format_fn=_short_author_formatter,
-    ...                         extra_info={
-    ...                            'get-warrenty':'%(get-warrenty)s',
-    ...                            'get-details':'%(get-details)s',
-    ...                            },
+    ...                         extra_info={'get-details':'%(get-details)s'},
     ...                         formatter_kwargs={'width': 50},
     ...                        ) # doctest: +ELLIPSIS
     Copyright (C) 2005 A <a@a.com>, B <b@b.edu>
     <BLANKLINE>
-    Hooke comes with ABSOLUTELY NO WARRANTY; %(get-warrenty)s.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; %(get-details)s for details.
+    Hooke comes with ABSOLUTELY NO WARRANTY and is licensed
+    under the GNU Lesser General Public License.  For details,
+    %(get-details)s
     """
     if original_year == final_year:
         date_range = '%s' % original_year
@@ -711,10 +707,7 @@ def update_pyfile(path, original_year_fn=original_year,
         _copyright_string(original_year, current_year, authors, prefix='',
                           text=SHORT_COPY_RIGHT_TEXT,
                           author_format_fn=_short_author_formatter,
-                          extra_info={
-                              'get-warrenty':'%(get-warrenty)s',
-                              'get-details':'%(get-details)s',
-                          }),
+                          extra_info={'get-details':'%(get-details)s'}),
         '""".strip() % extra_info',
         ]
     new_contents = '\n'.join(lines)+'\n'
@@ -759,8 +752,8 @@ automatically.
         test()
         sys.exit(0)
 
-    #update_authors(dry_run=options.dry_run, verbose=options.verbose)
-    #update_files(files=args, dry_run=options.dry_run, verbose=options.verbose)
+    update_authors(dry_run=options.dry_run, verbose=options.verbose)
+    update_files(files=args, dry_run=options.dry_run, verbose=options.verbose)
     if options.pyfile != None:
         update_pyfile(path=options.pyfile,
                       dry_run=options.dry_run, verbose=options.verbose)