Fix calling conventions (found by pychecker)

The test suite does not appear to test these code pathes.

3 files changed, 13 insertions, 15 deletions

diff --git a/src/nbblib/commands.py b/src/nbblib/commands.py
index 4064742..2c7cfdf 100644
--- a/src/nbblib/commands.py
+++ b/src/nbblib/commands.py
@@ -90,8 +90,8 @@ class Command(object):
         logging.debug("*cmdargs: %s", cmdargs)
         logging.debug("**kwargs: %s", kwargs)
         if len(cmdargs) > 0:
-            raise CommandLineError("'%s' command takes no parameters",
-                                   self.name)
+            raise CommandLineError("'%s' command takes no parameters"
+                                   % self.name)
         logging.debug("Command match!")
         return True
 
diff --git a/src/nbblib/main.py b/src/nbblib/main.py
index 8798608..fe4b304 100644
--- a/src/nbblib/main.py
+++ b/src/nbblib/main.py
@@ -122,12 +122,10 @@ class Property(object):
         else:
             setattr(instance, self.name, self.convert(value))
     def __str__(self):
-        if hasattr(instance, self.name):
-            return getattr(instance, self.name)
-        elif hasattr(self, 'default'):
-            return '<property defaulting to %s>' % self.default
+        if hasattr(self, 'default'):
+            return '<property %s defaulting to %s>' % (self.__class__.__name, self.default)
         else:
-            return '<undefined property>'
+            return '<property %s>' % (self.__class__.__name__)
     def isvalid(self, value):
         return True
     def convert(self, value):
diff --git a/src/nbblib/nbbcommands.py b/src/nbblib/nbbcommands.py
index 19d993e..3b57fa9 100644
--- a/src/nbblib/nbbcommands.py
+++ b/src/nbblib/nbbcommands.py
@@ -43,9 +43,9 @@ class HelpCommand(Command):
 
     def validate_args(self, *args, **kwargs):
         if len(args) == 1 and args[0] not in Command.plugins.keys():
-            raise CommandLineError("'%s' is an invalid command name", args[0])
+            raise CommandLineError("'%s' is an invalid command name" % args[0])
         elif len(args) > 1:
-            raise CommandLineError("'%s' command only takes one optional parameter", self.name)
+            raise CommandLineError("'%s' command only takes one optional parameter" % self.name)
 
     def _print_command_list(self):
         print "List of commands:"
@@ -284,19 +284,19 @@ class ConfigCommand(SourceClassCommand):
     def validate_args(self, *args, **kwargs):
         items = ('srcdir', 'builddir', 'installdir', )
         if len(args) == 0:
-            raise CommandLineError("'%s' command requires at least one parameter (%s)",
-                                   self.name, ', '.join(items))
+            raise CommandLineError("'%s' command requires at least one parameter (%s)"
+                                   % (self.name, ', '.join(items)))
         elif len(args) == 1 and args[0] in items:
             pass
         elif len(args) == 2 and args[0] in items:
             if args[0] in ('srcdir', ):
-                raise CommandLineError("'%s' command cannot change 'srcdir'",
-                                       self.name)
+                raise CommandLineError("'%s' command cannot change 'srcdir'"
+                                       % self.name)
             else:
                 pass
         else:
-            raise CommandLineError("'%s' requires less or different parameters",
-                                   self.name)
+            raise CommandLineError("'%s' requires less or different parameters"
+                                   % self.name)
 
     def run(self):
         git_get_items = ('builddir', 'installdir', 'srcdir')