From: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date: Wed, 27 Jul 2011 06:35:20 +0000 (+0530)
Subject: Vinkesh/Santhosh | Removed loading extensions from 'contrib' and fixed an indentation... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5e01fb7fbaa1c05b77bc294ef5b2dc064bcb8960;p=openstack-build%2Fneutron-build.git

Vinkesh/Santhosh | Removed loading extensions from 'contrib' and fixed an indentation bug while loading extensions
---

diff --git a/quantum/common/extensions.py b/quantum/common/extensions.py
index 9a2cbe633..430c0c94d 100644
--- a/quantum/common/extensions.py
+++ b/quantum/common/extensions.py
@@ -400,8 +400,6 @@ class ExtensionManager(object):
         widgets.py the extension class within that module should be
         'Widgets'.
 
-        In addition, extensions are loaded from the 'contrib' directory.
-
         See tests/unit/extensions/foxinsocks.py for an example
         extension implementation.
 
@@ -409,10 +407,6 @@ class ExtensionManager(object):
         if os.path.exists(self.path):
             self._load_all_extensions_from_path(self.path)
 
-        contrib_path = os.path.join(os.path.dirname(__file__), "contrib")
-        if os.path.exists(contrib_path):
-            self._load_all_extensions_from_path(contrib_path)
-
     def _load_all_extensions_from_path(self, path):
         for f in os.listdir(path):
             try:
@@ -430,7 +424,7 @@ class ExtensionManager(object):
                                   'file': ext_path})
                         continue
                     new_ext = new_ext_class()
-                self.add_extension(new_ext)
+                    self.add_extension(new_ext)
             except Exception as exception:
                 LOG.warn("extension file %s wasnt loaded due to %s",
                          f, exception)