[z3-checkins] r22072 - z3/Five/branch/rocky-products-less-product-loading

[rocky at codespeak.net]

Author: rocky
Date: Thu Jan 12 21:05:52 2006
New Revision: 22072

Modified:
   z3/Five/branch/rocky-products-less-product-loading/   (props changed)
   z3/Five/branch/rocky-products-less-product-loading/pythonproducts.py
Log:
Fixed up exceptions being raised during product registration.


Modified: z3/Five/branch/rocky-products-less-product-loading/pythonproducts.py
==============================================================================
--- z3/Five/branch/rocky-products-less-product-loading/pythonproducts.py	(original)
+++ z3/Five/branch/rocky-products-less-product-loading/pythonproducts.py	Thu Jan 12 21:05:52 2006
@@ -49,11 +49,16 @@
         module_ = package
     else:
         raise TypeError("The package argument must either be an instance of " \
-                        +"basestring or types.ModuleType")
+                        "basestring or types.ModuleType")
 
+    if not hasattr(module_, '__path__'):
+        raise ValueError("Registering a python package currently only " \
+                         "supports filesystem based pure python packages")
+
+    
     if not hasattr(module_, 'initialize'):
-        raise ValueError("The module '%s' requires a Zope 2 style " \
-                         +"initialize function" % module_.__name__)
+        raise AttributeError("The module '%s' requires a Zope 2 style " \
+                             "initialize function" % module_.__name__)
 
     product = initializeProduct(module_, 
                                 module_.__name__,