[Python-checkins] r52009 - sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py sandbox/branches/setuptools-0.6/setuptools/command/sdist.py

[phillip.eby]

Author: phillip.eby
Date: Tue Sep 26 22:19:21 2006
New Revision: 52009

Modified:
   sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py
   sandbox/branches/setuptools-0.6/setuptools/command/sdist.py
Log:
Should've used distutils.log.warn instead of warnings.warn
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/egg_info.py	Tue Sep 26 22:19:21 2006
@@ -226,8 +226,7 @@
                 dirurl = urlre.search(data).group(1)    # get repository URL
                 localrev = max([int(m.group(1)) for m in revre.finditer(data)])
             else:
-                from warnings import warn
-                warn("unrecognized .svn/entries format; skipping "+base)
+                log.warn("unrecognized .svn/entries format; skipping %s", base)
                 dirs[:] = []
                 continue
             if base==os.curdir:
@@ -244,6 +243,7 @@
 
 
 
+
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")

Modified: sandbox/branches/setuptools-0.6/setuptools/command/sdist.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/sdist.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/sdist.py	Tue Sep 26 22:19:21 2006
@@ -95,8 +95,7 @@
         for match in entries_pattern.finditer(data):
             yield joinpath(dirname,unescape(match.group(1)))
     else:
-        from warnings import warn
-        warn("unrecognized .svn/entries format in "+dirname)
+        log.warn("unrecognized .svn/entries format in %s", dirname)
 
 
 finders = [
@@ -121,6 +120,7 @@
 
 
 
+
 class sdist(_sdist):
     """Smart sdist that finds anything supported by revision control"""