[Python-checkins] distutils2: added the package_dir conversion

[tarek.ziade]

tarek.ziade pushed 98c67c12fc3e to distutils2:

http://hg.python.org/distutils2/rev/98c67c12fc3e
changeset:   730:98c67c12fc3e
tag:         tip
user:        Tarek Ziade <tarek at ziade.org>
date:        Sat Oct 02 02:15:25 2010 +0200
summary:     added the package_dir conversion
files:       distutils2/config.py, distutils2/tests/test_config.py

diff --git a/distutils2/config.py b/distutils2/config.py
--- a/distutils2/config.py
+++ b/distutils2/config.py
@@ -102,11 +102,21 @@
         if 'files' in parser.sections():
             files = dict([(key, self._multiline(value))
                           for key, value in parser.items('files')])
-            self.dist.packages = files.get('packages', [])
+            self.dist.packages = []
+            self.dist.package_dir = {}
+
+            for package in files.get('packages', []):
+                if ':' in package:
+                    dir_, package = package.split(':')
+                    self.dist.package_dir[package] = dir_
+                self.dist.packages.append(package)
+
             self.dist.py_modules = files.get('py_modules', [])
             if isinstance(self.dist.py_modules, str):
                 self.dist.py_modules = [self.dist.py_modules]
             self.dist.scripts = files.get('scripts', [])
+            if isinstance(self.dist.scripts, str):
+                self.dist.scripts = [self.dist.scripts]
 
             self.dist.package_data = {}
             for data in files.get('package_data', []):
diff --git a/distutils2/tests/test_config.py b/distutils2/tests/test_config.py
--- a/distutils2/tests/test_config.py
+++ b/distutils2/tests/test_config.py
@@ -48,8 +48,9 @@
 
 [files]
 packages = one
-           two
-           three
+           src:two
+           src2:three
+
 py_modules = haven
 
 scripts =
@@ -138,6 +139,7 @@
             [('bitmaps ', ['bm/b1.gif', 'bm/b2.gif']),
              ('config ', ['cfg/data.cfg']),
              ('/etc/init.d ', ['init-script'])])
+        self.assertEqual(dist.package_dir['two'], 'src')
 
 
 def test_suite():

--
Repository URL: http://hg.python.org/distutils2