Re-write global variables.

* gd_diff.py (bzr_base_url, bzr_pkg_readme_fmt)
(readme_url_fmt): Remove variables.
(sv_bzr_http, sv_bzr_gns, readme_link_fmt)
(readme_url_fmt): Add variables.
(construct_table_row): Update function.
* tests/test_gd_diff.py (TestGdDiff.test_generate_wiki_table): Update
 method.

1 files changed, 11 insertions, 5 deletions

diff --git a/gd_diff.py b/gd_diff.py
index c89729b..b8e968a 100644
--- a/gd_diff.py
+++ b/gd_diff.py
@@ -29,10 +29,16 @@ field_list = [
     'Changed-From-Debian',
 ]
 
-# bzr
-bzr_base_url = 'bzr://bzr.savannah.gnu.org/gnewsense/'
-bzr_pkg_readme_fmt = 'http://bzr.savannah.gnu.org/lh/gnewsense/packages-parkes/{}/annotate/head:/debian/README.gNewSense'
-readme_url_fmt = '%s/packages-{}/{}/debian/README.gNewSense' % bzr_base_url
+# urls
+sv_bzr_http = 'http://bzr.savannah.gnu.org'
+sv_bzr_gns = '/'.join(['bzr://bzr.savannah.gnu.org', 'gnewsense'])
+
+# fmt
+readme_link_fmt = '/'.join([sv_bzr_http, 'lh', 'gnewsense',
+                            'packages-parkes', '{}', 'annotate',
+                            'head:', 'debian', 'README.gNewSense'])
+readme_url_fmt = '/'.join([sv_bzr_gns, 'packages-{}', '{}','debian',
+                           'README.gNewSense'])
 
 
 def read_file(fpath):
@@ -353,7 +359,7 @@ def construct_table_row(pkg, change, reason):
     if reason is None:
         reason = ' '
 
-    more_info_link = bzr_pkg_readme_fmt.format(pkg)
+    more_info_link = readme_link_fmt.format(pkg)
 
     return '||{}||{}||{}||[[{}|more_info]]'.format(pkg, change, reason,
                                                    more_info_link)