[Python-checkins] distutils2 (merge default -> python3): Merge default

eric.araujo python-checkins at python.org
Tue Oct 18 18:16:40 CEST 2011


http://hg.python.org/distutils2/rev/34f377176773
changeset:   1213:34f377176773
branch:      python3
parent:      1211:98e0d3c53a2f
parent:      1212:5d858149df06
user:        Éric Araujo <merwok at netwok.org>
date:        Tue Oct 18 18:16:00 2011 +0200
summary:
  Merge default

files:
  distutils2/config.py |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/distutils2/config.py b/distutils2/config.py
--- a/distutils2/config.py
+++ b/distutils2/config.py
@@ -233,8 +233,7 @@
                     raise ValueError('invalid line for package_data: %s '
                                      '(misses "=")' % line)
                 key, value = data
-                globs = self.dist.package_data.setdefault(key.strip(), [])
-                globs.extend([v.strip() for v in value.split(',')])
+                self.dist.package_data[key.strip()] = value.strip()
 
             self.dist.data_files = []
             for data in files.get('data_files', []):

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


More information about the Python-checkins mailing list