# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1420355586 28800
# Node ID acc718ab56da2aeecce83a9fe8240f48f2b0b607
# Parent  ff5b2d3863a8673e2391532e5b91cded9e94c917
setup: Make version generation compatible with PEP440.

diff -r ff5b2d3863a8 -r acc718ab56da setup.py
--- a/setup.py	Sat Jan 03 22:07:35 2015 -0800
+++ b/setup.py	Sat Jan 03 23:13:06 2015 -0800
@@ -63,6 +63,7 @@
         raise Exception("Can't generate version number: this is not a "
                         "Mercurial repository.")
 
+
 def generate_version_from_mercurial():
     try:
         # Get the version we're currently on. Also see if we have local
@@ -93,10 +94,14 @@
                 # Let's just do as if we were on the tag.
                 version = tag
             else:
-                version = '%s-%s-%s' % (tag, dist, hgid)
+                version = '%s+%s.%s' % (tag, dist, hgid)
 
         if has_local_changes:
-            version += time.strftime('+%Y%m%d')
+            if '+' in version:
+                version += '.'
+            else:
+                version += '+'
+            version += time.strftime('%Y%m%d')
 
         return version
     except OSError: