Source

english-editing / code-eng-edit

diff -r 3eb7eca9042a distribute_setup.py
--- a/distribute_setup.py	Tue Sep 22 17:41:21 2009 -0700
+++ b/distribute_setup.py	Tue Sep 22 17:43:48 2009 -0700
@@ -194,7 +194,7 @@
 
 def _rename_path(path):
     new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s into %s', path, new_name)
+    log.warn('Renaming %s to %s', path, new_name)
     try:
         from setuptools.sandbox import DirectorySandbox
         def _violation(*args):
@@ -209,7 +209,7 @@
 
 def _remove_flat_installation(placeholder):
     if not os.path.isdir(placeholder):
-        log.warn('Unkown installation at %s', placeholder)
+        log.warn('Unknown installation at %s', placeholder)
         return False
     found = False
     for file in os.listdir(placeholder):
@@ -320,7 +320,7 @@
     ws = pkg_resources.working_set
     setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
     if setuptools_dist is None:
-        log.warn('No setuptools distribution found')
+        log.warn('No Setuptools distribution found')
         return
     # detecting if it was already faked
     setuptools_location = setuptools_dist.location
diff -r 3eb7eca9042a setuptools/depends.py
--- a/setuptools/depends.py	Tue Sep 22 17:41:21 2009 -0700
+++ b/setuptools/depends.py	Tue Sep 22 17:43:48 2009 -0700
@@ -27,7 +27,7 @@
 
 
     def full_name(self):
-        """Return full package/distribution name, w/version"""
+        """Return full package/distribution name with version"""
         if self.requested_version is not None:
             return '%s-%s' % (self.name,self.requested_version)
         return self.name
diff -r 3eb7eca9042a setuptools/dist.py
--- a/setuptools/dist.py	Tue Sep 22 17:41:21 2009 -0700
+++ b/setuptools/dist.py	Tue Sep 22 17:43:48 2009 -0700
@@ -61,7 +61,7 @@
             parent = '.'.join(nsp.split('.')[:-1])
             if parent not in value:
                 distutils.log.warn(
-                    "%r is declared as a package namespace, but %r is not:"
+                    "%r is declared as a package namespace, but %r is not;"
                     " please correct this in setup.py", nsp, parent
                 )
 
@@ -581,7 +581,7 @@
     def get_cmdline_options(self):
         """Return a '{cmd: {opt:val}}' map of all command-line options
 
-        Option names are all long, but do not include the leading '--', and
+        Option names are all long, but do not include the leading '--' and
         contain dashes rather than underscores.  If the option doesn't take
         an argument (e.g. '--quiet'), the 'val' is 'None'.
 
diff -r 3eb7eca9042a virtual-python.py
--- a/virtual-python.py	Tue Sep 22 17:41:21 2009 -0700
+++ b/virtual-python.py	Tue Sep 22 17:43:48 2009 -0700
@@ -41,7 +41,7 @@
 
 def main():
     if os.name != 'posix':
-        print "This script only works on Unix-like platforms, sorry."
+        print "Sorry, this script only works on Unix-like platforms."
         return
 
     parser = optparse.OptionParser()