Merge extensions/python/xpcom changes from DOM_AGNOSTIC2_BRANCH into the

trunk.


git-svn-id: svn://10.0.0.236/trunk@187878 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/python/xpcom/server/loader.py

@@ -36,7 +36,7 @@
 # ***** END LICENSE BLOCK *****
 
 import xpcom
-from xpcom import components
+from xpcom import components, nsError
 import xpcom.shutdown
 
 import module
@@ -93,6 +93,8 @@ class ModuleLoader:
 
     def _getCOMModuleForLocation(self, componentFile):
         fqn = componentFile.path
+        if not fqn.endswith(".py"):
+            raise xpcom.ServerException(nsError.NS_ERROR_INVALID_ARG)
         mod = self.com_modules.get(fqn)
         if mod is not None:
             return mod