[Python-checkins] python/nondist/sandbox/setuptools/setuptools dist.py, 1.13, 1.14

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13460/setuptools

Modified Files:
	dist.py 
Log Message:
Implement ``namespace_packages`` keyword to ``setup()``.  Added keyword
summary to setuptools doc.  Begin work on ``zip_safe`` flag.


Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/dist.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dist.py	10 Jul 2005 04:49:31 -0000	1.13
+++ dist.py	10 Jul 2005 15:43:08 -0000	1.14
@@ -90,6 +90,8 @@
         self.install_requires = []
         self.extras_require = {}
         self.dist_files = []
+        self.zip_safe = None
+        self.namespace_packages = None
         _Distribution.__init__(self,attrs)
         if not have_package_data:
             from setuptools.command.build_py import build_py
@@ -100,19 +102,17 @@
         self.cmdclass.setdefault('install_lib',install_lib)
         self.cmdclass.setdefault('sdist',sdist)
 
+    def parse_command_line(self):
+        """Process features after parsing command line options"""
+        result = _Distribution.parse_command_line(self)
+        if self.features:
+            self._finalize_features()
+        return result
 
 
-
-
-
-
-
-
-
-
-
-
-
+    def _feature_attrname(self,name):
+        """Convert feature name to corresponding option attribute name"""
+        return 'with_'+name.replace('-','_')
 
 
 
@@ -123,10 +123,8 @@
 
     def finalize_options(self):
         _Distribution.finalize_options(self)
-
         if self.features:
             self._set_global_opts_from_features()
-
         if self.extra_path:
             raise DistutilsSetupError(
                 "The 'extra_path' parameter is not needed when using "
@@ -148,19 +146,21 @@
                 "strings or lists of strings containing valid project/version "
                 "requirement specifiers."
             )
-
-    def parse_command_line(self):
-        """Process features after parsing command line options"""
-        result = _Distribution.parse_command_line(self)
-        if self.features:
-            self._finalize_features()
-        return result
-
-
-    def _feature_attrname(self,name):
-        """Convert feature name to corresponding option attribute name"""
-        return 'with_'+name.replace('-','_')
-
+        if self.namespace_packages is not None:
+            try:
+                assert ''.join(self.namespace_packages)!=self.namespace_packages
+            except (TypeError,ValueError,AttributeError,AssertionError):
+                raise DistutilsSetupError(
+                    "'namespace_packages' must be a sequence of strings"
+                )
+            for nsp in self.namespace_packages:
+                for name in iter_distribution_names(self):
+                    if name.startswith(nsp+'.'): break
+                else:
+                    raise DistutilsSetupError(
+                        "Distribution contains no modules or packages for " +
+                        "namespace package %r" % nsp
+                    )
 
     def _set_global_opts_from_features(self):
         """Add --with-X/--without-X options based on optional features"""
@@ -490,6 +490,47 @@
         return d
 
 
+def iter_distribution_names(distribution):
+    """Yield all packages, modules, and extensions declared by distribution"""
+
+    for pkg in distribution.packages or ():
+        yield pkg
+
+    for module in distribution.py_modules or ():
+        yield module
+
+    for ext in distribution.ext_modules or ():
+        if isinstance(ext,tuple):
+            name,buildinfo = ext
+            yield name
+        else:
+            yield ext.name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class Feature:
     """A subset of the distribution that can be excluded if unneeded/wanted