From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 21 Nov 2014 05:27:18 +0000 (+0000)
Subject: setup.py: use constant for _version.py filename.
X-Git-Url: https://git.rkrishnan.org/vdrive/global?a=commitdiff_plain;h=f2b596a6084c823d4bcf76e06e072e8ebd2f39e6;p=tahoe-lafs%2Ftahoe-lafs.git

setup.py: use constant for _version.py filename.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/setup.py b/setup.py
index f18b82aa..31f1289b 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,8 @@ def read_version_py(infname):
         if mo:
             return mo.group(1)
 
-version = read_version_py("src/allmydata/_version.py")
+VERSION_PY_FILENAME = 'src/allmydata/_version.py'
+version = read_version_py(VERSION_PY_FILENAME)
 
 APPNAME='allmydata-tahoe'
 APPNAMEFILE = os.path.join('src', 'allmydata', '_appname.py')
@@ -361,17 +362,20 @@ class UpdateVersion(Command):
     def try_from_git(self):
         versions = versions_from_git("allmydata-tahoe-")
         if versions:
+            version_info = {
+                "pkgname": self.distribution.get_name(),
+                "version": versions["version"],
+                "normalized": versions["normalized"],
+                "full": versions["full"],
+                "branch": versions["branch"],
+            }
+
             fn = 'src/allmydata/_version.py'
             f = open(fn, "wb")
-            f.write(GIT_VERSION_BODY %
-                    { "pkgname": self.distribution.get_name(),
-                      "version": versions["version"],
-                      "normalized": versions["normalized"],
-                      "full": versions["full"],
-                      "branch": versions["branch"],
-                    })
+            f.write(GIT_VERSION_PY % version_info)
             f.close()
             print("git-version: wrote '%s' into '%s'" % (versions["version"], fn))
+
         return versions.get("normalized", None)