MAINT: clean up the code of gitinfo function.

Author: pavoljuhas

site_scons/libdiffpybuildutils.py

@@ -4,26 +4,29 @@
 '''
 
 import os
+import re
 
 MYDIR = os.path.dirname(os.path.abspath(__file__))
 
 def gitinfo():
     'Extract dictionary of version data from git records.'
-    import re
     from subprocess import Popen, PIPE
     global _cached_gitinfo
-    if _cached_gitinfo is not None:  return _cached_gitinfo
-    rv = _cached_gitinfo = {}
+    if _cached_gitinfo is not None:
+        return _cached_gitinfo
     nullfile = open(os.devnull, 'w')
     kw = dict(stdout=PIPE, stderr=nullfile, cwd=MYDIR)
     proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
-    if proc.wait():  return gitinfo()
+    if proc.wait():
+        _cached_gitinfo = {}
+        return gitinfo()
     proc = Popen(['git', 'log', '-1', '--format=%H %ai'], **kw)
     glog = proc.stdout.read()
     words = desc.strip().split('-')
     vtag = words[0].lstrip('v')
     vnum = int((words[1:2] or ['0'])[0])
+    rv = {}
     rv['commit'], rv['date'] = glog.strip().split(None, 1)
     mx = re.match(r'^(\d+)\.(\d+)(?:\.(\d+))?((?:[ab]|rc)\d*)?', vtag)
     rv['major'] = int(mx.group(1))