Merge lp:~pconnell/endroid/bugfix into lp:endroid

[Phil Connell]

Allow command plugin dependencies to be specified in any iterable type.

    Previously plugin.dependencies was forced to be a tuple. A naive change in the
    SMS plugin hit this restriction:

    >>> import endroid.plugins.sms
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
      File "/usr/lib/python2.7/dist-packages/endroid/plugins/sms/__init__.py", line 27, in <module>
        class SMS(CommandPlugin):
      File "/usr/lib/python2.7/dist-packages/endroid/plugins/command.py", line 158, in __new__
        ('endroid.plugins.command',))
    TypeError: Error when calling the metaclass bases
        can only concatenate list (not "tuple") to list

    Rather than changing the SMS plugin, it's better to make the command plugin
    more lenient.

Recent changes to the SMS plugin exposed a bug in command plugin dependency handling: dependencies had to be specified as a tuple. SMS was using a list, meaning attempts to import it failed:

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/lib/python2.7/dist-packages/endroid/plugins/sms/__init__.py", line 27, in <module>
    class SMS(CommandPlugin):
  File "/usr/lib/python2.7/dist-packages/endroid/plugins/command.py", line 158, in __new__
    ('endroid.plugins.command',))
TypeError: Error when calling the metaclass bases
    can only concatenate list (not "tuple") to list

Update Command to allow any iterable instead. It looks like the old code attempted to do this (just passed the wrong arg to tuple()).

[Patrick Stevens (patrickas)]

review: Approve

=== modified file 'src/endroid/plugins/command.py'
--- src/endroid/plugins/command.py	2013-08-21 22:06:20 +0000
+++ src/endroid/plugins/command.py	2014-08-20 12:16:20 +0000
@@ -154,8 +154,8 @@
         dct['_help_topics'] = topics
         dct['help_topics'] = _Topics
 
-        dct['dependencies'] = tuple(dct.get('dependencies', ()) +
-                                    ('endroid.plugins.command',))
+        dct['dependencies'] = (tuple(dct.get('dependencies', ())) +
+                               ('endroid.plugins.command',))
         return super(CommandPluginMeta, meta).__new__(meta, name, bases, dct)
 
 class CommandPlugin(Plugin):