[Python-checkins] distutils2: renames datafiles in ressources for consistency with setup.cfg section

tarek.ziade python-checkins at python.org
Wed Feb 16 22:23:58 CET 2011


tarek.ziade pushed e707b3a6ce74 to distutils2:

http://hg.python.org/distutils2/rev/e707b3a6ce74
changeset:   1075:e707b3a6ce74
user:        Pierre-Yves David <pierre-yves.david at logilab.fr>
date:        Wed Feb 02 11:38:07 2011 +0100
summary:
  renames datafiles in ressources for consistency with setup.cfg section

files:
  distutils2/_backport/pkgutil.py
  distutils2/command/install_data.py
  distutils2/command/install_dist.py
  distutils2/command/install_distinfo.py
  distutils2/config.py
  distutils2/datafiles.py
  distutils2/resources.py
  distutils2/tests/test_datafiles.py
  distutils2/tests/test_resources.py

diff --git a/distutils2/_backport/pkgutil.py b/distutils2/_backport/pkgutil.py
--- a/distutils2/_backport/pkgutil.py
+++ b/distutils2/_backport/pkgutil.py
@@ -759,9 +759,9 @@
             yield path, md5, size
 
     def get_resource_path(self, relative_path):
-        datafiles_file = self.get_distinfo_file('DATAFILES')
-        datafiles_reader = csv_reader(datafiles_file, delimiter = ',')
-        for relative, destination in datafiles_reader:
+        resources_file = self.get_distinfo_file('DATAFILES')
+        resources_reader = csv_reader(resources_file, delimiter = ',')
+        for relative, destination in resources_reader:
             if relative == relative_path:
                 return destination
         raise KeyError('No data_file with relative path %s were installed' %
diff --git a/distutils2/command/install_data.py b/distutils2/command/install_data.py
--- a/distutils2/command/install_data.py
+++ b/distutils2/command/install_data.py
@@ -76,5 +76,5 @@
     def get_outputs(self):
         return self.outfiles
 
-    def get_datafiles_out(self):
+    def get_resources_out(self):
         return self.data_files_out
\ No newline at end of file
diff --git a/distutils2/command/install_dist.py b/distutils2/command/install_dist.py
--- a/distutils2/command/install_dist.py
+++ b/distutils2/command/install_dist.py
@@ -87,7 +87,7 @@
         ('record=', None,
          "filename in which to record a list of installed files "
          "(not PEP 376-compliant)"),
-        ('datafiles=', None,
+        ('resources=', None,
          "data files mapping"),
 
         # .dist-info related arguments, read by install_dist_info
@@ -186,14 +186,14 @@
         #self.install_info = None
 
         self.record = None
-        self.datafiles = None
+        self.resources = None
 
         # .dist-info related options
         self.no_distinfo = None
         self.installer = None
         self.requested = None
         self.no_record = None
-        self.no_datafiles = None
+        self.no_resources = None
 
     # -- Option finalizing methods -------------------------------------
     # (This is rather more involved than for most commands,
diff --git a/distutils2/command/install_distinfo.py b/distutils2/command/install_distinfo.py
--- a/distutils2/command/install_distinfo.py
+++ b/distutils2/command/install_distinfo.py
@@ -39,11 +39,11 @@
          "do not generate a REQUESTED file"),
         ('no-record', None,
          "do not generate a RECORD file"),
-        ('no-datafiles', None,
+        ('no-resources', None,
          "do not generate a DATAFILES list installed file")
     ]
 
-    boolean_options = ['requested', 'no-record', 'no-datafiles']
+    boolean_options = ['requested', 'no-record', 'no-resources']
 
     negative_opt = {'no-requested': 'requested'}
 
@@ -52,7 +52,7 @@
         self.installer = None
         self.requested = None
         self.no_record = None
-        self.no_datafiles = None
+        self.no_resources = None
 
     def finalize_options(self):
         self.set_undefined_options('install_dist',
@@ -69,8 +69,8 @@
             self.requested = True
         if self.no_record is None:
             self.no_record = False
-        if self.no_datafiles is None:
-            self.no_datafiles = False
+        if self.no_resources is None:
+            self.no_resources = False
 
 
         metadata = self.distribution.metadata
@@ -120,20 +120,20 @@
                 self.outputs.append(requested_path)
 
 
-            if not self.no_datafiles:
+            if not self.no_resources:
                 install_data = self.get_finalized_command('install_data')
-                if install_data.get_datafiles_out() != []:
-                    datafiles_path = os.path.join(self.distinfo_dir, 'DATAFILES')
-                    logger.info('creating %s', datafiles_path)
-                    f = open(datafiles_path, 'wb')
+                if install_data.get_resources_out() != []:
+                    resources_path = os.path.join(self.distinfo_dir, 'DATAFILES')
+                    logger.info('creating %s', resources_path)
+                    f = open(resources_path, 'wb')
                     try:
                         writer = csv.writer(f, delimiter=',',
                                             lineterminator=os.linesep,
                                             quotechar='"')
-                        for tuple in install_data.get_datafiles_out():
+                        for tuple in install_data.get_resources_out():
                             writer.writerow(tuple)
 
-                        self.outputs.append(datafiles_path)
+                        self.outputs.append(resources_path)
                     finally:
                         f.close()
 
diff --git a/distutils2/config.py b/distutils2/config.py
--- a/distutils2/config.py
+++ b/distutils2/config.py
@@ -14,7 +14,7 @@
 from distutils2.util import check_environ, resolve_name, strtobool
 from distutils2.compiler import set_compiler
 from distutils2.command import set_command
-from distutils2.datafiles import resources_dests
+from distutils2.resources import resources_dests
 from distutils2.markers import interpret
 
 
diff --git a/distutils2/datafiles.py b/distutils2/resources.py
rename from distutils2/datafiles.py
rename to distutils2/resources.py
--- a/distutils2/datafiles.py
+++ b/distutils2/resources.py
@@ -17,7 +17,7 @@
             base = basepath
         if '*' in base or '{' in base or '}'  in base:
             raise NotImplementedError('glob are not supported into base part\
-                of datafiles definition. %r is an invalide basepath' % base)
+                of resources definition. %r is an invalide basepath' % base)
         absglob = os.path.join(base, self.suffix)
         for glob_file in iglob(absglob):
             path_suffix = glob_file[len(base):].lstrip('/')
diff --git a/distutils2/tests/test_datafiles.py b/distutils2/tests/test_resources.py
rename from distutils2/tests/test_datafiles.py
rename to distutils2/tests/test_resources.py
--- a/distutils2/tests/test_datafiles.py
+++ b/distutils2/tests/test_resources.py
@@ -5,7 +5,7 @@
 
 from distutils2.tests import unittest, support, run_unittest
 from distutils2.tests.test_glob import GlobTestCaseBase
-from distutils2.datafiles import resources_dests
+from distutils2.resources import resources_dests
 from distutils2.command.install_dist import install_dist
 from distutils2._backport.pkgutil import resource_open, resource_path
 

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


More information about the Python-checkins mailing list