From a6fa59cc35525d207c7dd7195e63b0b4827ad380 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Fri, 16 Jan 2009 16:21:54 +0000
Subject: [PATCH] Add support for subdirectories in the plugins directory.

svn: r11631
---
 src/gen/plug/_manager.py | 46 +++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py
index 3f4c3b6c0..29234e6e4 100644
--- a/src/gen/plug/_manager.py
+++ b/src/gen/plug/_manager.py
@@ -123,34 +123,36 @@ class PluginManager(gen.utils.Callback):
         if not os.path.isdir(direct):
             return False # return value is True for error
     
-        # if the path has not already been loaded, save it in the loaddir_list
-        # list for use on reloading
-    
-        if direct not in self.__loaddir_list:
-            self.__loaddir_list.append(direct)
-    
-        # add the directory to the python search path
-        sys.path.append(direct)
-    
         pymod = re.compile(r"^(.*)\.py$")
     
         # loop through each file in the directory, looking for files that
         # have a .py extention, and attempt to load the file. If it succeeds,
         # add it to the success_list list. If it fails, add it to the _failure
         # list
-        
-        for filename in os.listdir(direct):
-            name = os.path.split(filename)
-            match = pymod.match(name[1])
-            if not match:
-                continue
-            self.__attempt_list.append(filename)
-            plugin = match.groups()[0]
-            try: 
-                _module = __import__(plugin)
-                self.__success_list.append((filename, _module))
-            except:
-                self.__failmsg_list.append((filename, sys.exc_info()))
+
+        for (dirpath, dirnames, filenames) in os.walk(direct):
+            
+            # add the directory to the python search path
+            sys.path.append(dirpath)
+            
+            # if the path has not already been loaded, save it in the 
+            # loaddir_list list for use on reloading.
+            if dirpath not in self.__loaddir_list:
+                self.__loaddir_list.append(dirpath)
+                       
+            for filename in filenames:
+                name = os.path.split(filename)
+                match = pymod.match(name[1])
+                if not match:
+                    continue
+                self.__attempt_list.append(filename)
+                plugin = match.groups()[0]
+                try: 
+                    _module = __import__(plugin)
+                    self.__success_list.append((filename, _module))
+                except:
+                    self.__failmsg_list.append((filename, sys.exc_info()))
+                    
         return len(self.__failmsg_list) != 0 # return True if there are errors
 
     def reload_plugins(self):