lists.onelist(): Instead of passing multiple, possibly empty lists, build the list of directories to search before calling the method.

src/lists.py

@@ -198,16 +198,15 @@ def linklist(ponydirs = None, quoters = [], ucsiser = None):
         _print_columnised(list(ponies))
 
 
-def onelist(standarddirs, extradirs, ucsiser):
+def onelist(pony_dirs, ucsiser):
     '''
     Lists the available ponies on one column without anything bold or otherwise formated
     
-    @param  standard:itr<str>         Include standard ponies
+    @param  pony_dirs:itr<str>        List of directories to search for ponies
-    @param  extra:itr<str>            Include extra ponies
     @param  ucsiser:(list<str>)→void  Function used to UCS:ise names
     '''
     ## Get all pony files
-    ponies = [name for dir_list in [standarddirs, extradirs] for dir in dir_list for name in _get_file_list(dir, '.pony')]
+    ponies = [name for dir in pony_dirs for name in _get_file_list(dir, '.pony')]
     
     ## UCS:ise and sort
     ucsiser(ponies)

src/ponysay.py

@@ -760,9 +760,10 @@ class Ponysay():
         @param  standard:bool  Include standard ponies
         @param  extra:bool     Include extra ponies
         '''
-        lists.onelist(self.ponydirs if standard else [],
+        
-                      self.extraponydirs if extra else [],
+        pony_dirs = (self.ponydirs if standard else []) + (self.extraponydirs if extra else [])
-                      self.__ucsise)
+        
+        lists.onelist(pony_dirs, self.__ucsise)
     
     
     def quoters(self, standard = True, extra = False):