get version.py & hg_keywords.py working

2 files changed, 6 insertions, 2 deletions

diff --git a/hg_keywords.py b/hg_keywords.py
index 778c514..edc9bae 100644
--- a/hg_keywords.py
+++ b/hg_keywords.py
@@ -1,6 +1,6 @@
 import re
 
-keyword_rx = re.compile('^\$(\w+)\:\s+(\W+)\s*\$$')
+keyword_rx = re.compile('^\$(\w+)\:\s+(\S*)\s*\$$')
 
 # returns tuple (key, value)
 # returns None if kwstring is not a keyword expansion
@@ -16,4 +16,6 @@ def extract_keyvalue(kwstring):
 
     
 def keywords(*kwstrings):
-    dict([extract_kwvalue(kws) for kws in kwstrings])
+    keyvalues = [extract_keyvalue(kws) for kws in kwstrings]
+    compacted_keyvalues = [kv for kv in keyvalues if kv is not None]
+    return dict(compacted_keyvalues)
diff --git a/version.py b/version.py
index da0590e..f9efac4 100644
--- a/version.py
+++ b/version.py
@@ -6,3 +6,5 @@ keywords = hg_keywords.keywords(
     "$rev$",
     "$tags$"
     )
+
+version = "dev_%s_%s" % tuple([keywords[x] for x in 'rev', 'node'])