[Python-checkins] r52002 - in sandbox/branches/setuptools-0.6: pkg_resources.py pkg_resources.txt setuptools/tests/test_resources.py

[phillip.eby]

Author: phillip.eby
Date: Mon Sep 25 20:00:15 2006
New Revision: 52002

Modified:
   sandbox/branches/setuptools-0.6/pkg_resources.py
   sandbox/branches/setuptools-0.6/pkg_resources.txt
   sandbox/branches/setuptools-0.6/setuptools/tests/test_resources.py
Log:
Fix "dev" versions being considered newer than release candidates.
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/pkg_resources.py
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.py	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.py	Mon Sep 25 20:00:15 2006
@@ -1747,7 +1747,7 @@
 ).match
 
 component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
-replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c'}.get
+replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get
 
 def _parse_version_parts(s):
     for part in component_re.split(s):

Modified: sandbox/branches/setuptools-0.6/pkg_resources.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.txt	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.txt	Mon Sep 25 20:00:15 2006
@@ -1540,7 +1540,8 @@
     Finally, to handle miscellaneous cases, the strings "pre", "preview", and
     "rc" are treated as if they were "c", i.e. as though they were release
     candidates, and therefore are not as new as a version string that does not
-    contain them.
+    contain them.  And the string "dev" is treated as if it were an "@" sign;
+    that is, a version coming before even "a" or "alpha".
 
 .. _yield_lines():
 
@@ -1691,6 +1692,9 @@
 Release Notes/Change History
 ----------------------------
 
+0.6c4
+ * Fix "dev" versions being considered newer than release candidates.
+
 0.6c3
  * Python 2.5 compatibility fixes.
 

Modified: sandbox/branches/setuptools-0.6/setuptools/tests/test_resources.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/tests/test_resources.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/tests/test_resources.py	Mon Sep 25 20:00:15 2006
@@ -471,6 +471,7 @@
         c('0.0.4', '0.4.0')
         c('0pl1', '0.4pl1')
         c('2.1.0-rc1','2.1.0')
+        c('2.1dev','2.1a0')
 
         torture ="""
         0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1