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

[eric.araujo]

http://hg.python.org/distutils2/rev/a22859e3ebb9
changeset:   1283:a22859e3ebb9
branch:      python3
parent:      1274:ea717d8e71d0
parent:      1276:cfdf8964c3dc
user:        Éric Araujo <merwok at netwok.org>
date:        Thu Feb 09 02:09:07 2012 +0100
summary:
  Merge touch-ups from default

files:
  distutils2/util.py    |  2 +-
  distutils2/version.py |  6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/distutils2/util.py b/distutils2/util.py
--- a/distutils2/util.py
+++ b/distutils2/util.py
@@ -1049,7 +1049,6 @@
 
 SETUP_TEMPLATE = """\
 # This script was automatically generated by distutils2
-import os
 import codecs
 from distutils.core import setup
 try:
@@ -1057,6 +1056,7 @@
 except ImportError:
     from configparser import RawConfigParser
 
+
 %(split_multiline)s
 
 %(cfg_to_args)s
diff --git a/distutils2/version.py b/distutils2/version.py
--- a/distutils2/version.py
+++ b/distutils2/version.py
@@ -293,12 +293,12 @@
 
     # The 'r' and the '-' tags are post release tags
     #   0.4a1.r10       ->  0.4a1.post10
-    #   0.9.33-17222    ->  0.9.3.post17222
-    #   0.9.33-r17222   ->  0.9.3.post17222
+    #   0.9.33-17222    ->  0.9.33.post17222
+    #   0.9.33-r17222   ->  0.9.33.post17222
     rs = re.sub(r"\.?(r|-|-r)\.?(\d+)$", r".post\2", rs)
 
     # Clean 'r' instead of 'dev' usage:
-    #   0.9.33+r17222   ->  0.9.3.dev17222
+    #   0.9.33+r17222   ->  0.9.33.dev17222
     #   1.0dev123       ->  1.0.dev123
     #   1.0.git123      ->  1.0.dev123
     #   1.0.bzr123      ->  1.0.dev123

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